AgeCommit message (Expand)Author
2010-08-18merge script: --ff-only to disallow true mergeJonathan Nieder
2010-08-18merge script: handle many-way octopusJonathan Nieder
2010-08-18merge script: handle -m --log correctlyJonathan Nieder
2010-08-18merge script: forbid merge -s indexJonathan Nieder
2010-08-18merge script: allow custom strategiesJonathan Nieder
2010-08-18merge script: merge -X<option>Jonathan Nieder
2010-08-18merge script: improve log message subjectJonathan Nieder
2010-08-18merge script: refuse to merge during mergeJonathan Nieder
2010-08-18merge script: tweak unmerged files message to match builtinJonathan Nieder
2010-08-18merge script: --squash, --ff from unborn branch are errorsJonathan Nieder
2010-08-18fmt-merge-msg -m to override merge titleJonathan Nieder
2010-08-18merge-base --independent to print reduced parent list in a mergeJonathan Nieder
2010-08-18merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder
2010-08-18Documentation: add a SEE ALSO section for merge-baseJonathan Nieder
2010-08-18t6200 (fmt-merge-msg): style nitpicksJonathan Nieder
2010-08-18t6010 (merge-base): modernize styleJonathan Nieder
2010-08-18t7600 (merge): test merge from branch yet to be bornJonathan Nieder
2010-08-18t7600 (merge): check reflog entryJonathan Nieder
2010-08-18t7600 (merge): do not launch gitk for --debugJonathan Nieder
2010-08-18t7600 (merge): modernize styleJonathan Nieder
2010-08-18merge: do not mistake (ancestor of) tag for branchJonathan Nieder
2010-07-21Git 1.7.2v1.7.2Junio C Hamano
2010-07-21tests: correct "does reflog exist?" testsJunio C Hamano
2010-07-21t/: work around one-shot variable assignment with test_must_failBrandon Casey
2010-07-21t/README: correct an exception when breaking a && chain in testsJonathan Nieder
2010-07-20t/{t5541,lib-httpd}: replace problematic '!()' notation with test_must_failBrandon Casey
2010-07-20t/t3700: convert two uses of negation operator '!' to use test_must_failBrandon Casey
2010-07-20Merge branch 'maint'Junio C Hamano
2010-07-20t/README: clarify test_must_fail descriptionBrandon Casey
2010-07-20Check size of path buffer before writing into itGreg Brockman
2010-07-19Merge branch 'maint'Junio C Hamano
2010-07-19update-server-info: Shorten read_pack_info_file()Ralf Thielow
2010-07-19git add: Add --ignore-missing to SYNOPSISÆvar Arnfjörð Bjarmason
2010-07-19git submodule add: Remove old docs about implicit -fÆvar Arnfjörð Bjarmason
2010-07-19git submodule add: Require the new --force option to add ignored pathsJens Lehmann
2010-07-19Merge branch 'jl/add-n-ignore-missing'Junio C Hamano
2010-07-19Documentation: Explain git-mergetool's use of temporary filesDavid Aguilar
2010-07-19git-svn: write memoized data explicitly to avoid Storable bugSergey Vlasov
2010-07-16Merge branch 'jc/diff-merge-base-multi'Junio C Hamano
2010-07-16Only run aggregate-results over actual countsThomas Rast
2010-07-16Add a sample user for the svndump libraryJonathan Nieder
2010-07-16diff A...B: do not limit the syntax too narrowlyJunio C Hamano
2010-07-15Merge branch 'jn/paginate-fix'Junio C Hamano
2010-07-15Merge branch 'wp/merge-tree-fix'Junio C Hamano
2010-07-15Merge branch 'js/merge-rr-fix'Junio C Hamano
2010-07-15Merge branch 'jc/diff-merge-base-multi'Junio C Hamano
2010-07-15Merge branch 'ns/merge-recursive-uptodate'Junio C Hamano
2010-07-15Merge branch 'jn/tests'Junio C Hamano
2010-07-15Merge branch 'eb/doc-log-manpage'Junio C Hamano
2010-07-15Merge branch 'jn/grep-open'Junio C Hamano