summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-08-19Merge branch 'jc/sha1-name-find-fix' into maintLibravatar Junio C Hamano1-10/+11
2010-08-19t/t9010-svn-fe.sh: add an +x bit to this testLibravatar Ævar Arnfjörð Bjarmason1-0/+0
2010-08-19t9155: fix compatibility with older SVNLibravatar Eric Wong1-1/+1
2010-08-18Merge branch 'sp/fix-smart-http-deadlock-on-error' into maintLibravatar Junio C Hamano1-2/+3
2010-08-18merge script: learn --[no-]rerere-autoupdateLibravatar Jonathan Nieder1-2/+5
2010-08-18merge script: notice @{-1} shorthandLibravatar Jonathan Nieder1-2/+4
2010-08-18merge script: handle --no-ff --no-commit correctlyLibravatar Jonathan Nieder1-2/+10
2010-08-18merge script: --ff-only to disallow true mergeLibravatar Jonathan Nieder1-2/+15
2010-08-18merge script: handle many-way octopusLibravatar Jonathan Nieder1-3/+3
2010-08-18merge script: handle -m --log correctlyLibravatar Jonathan Nieder1-4/+10
2010-08-18merge script: forbid merge -s indexLibravatar Jonathan Nieder1-0/+5
2010-08-18merge script: allow custom strategiesLibravatar Jonathan Nieder1-2/+6
2010-08-18merge script: merge -X<option>Libravatar Jonathan Nieder1-1/+7
2010-08-18merge script: improve log message subjectLibravatar Jonathan Nieder1-8/+19
2010-08-18merge script: refuse to merge during mergeLibravatar Jonathan Nieder1-0/+3
2010-08-18merge script: tweak unmerged files message to match builtinLibravatar Jonathan Nieder1-1/+1
2010-08-18merge script: --squash, --ff from unborn branch are errorsLibravatar Jonathan Nieder1-0/+4
2010-08-18fmt-merge-msg -m to override merge titleLibravatar Jonathan Nieder3-4/+55
2010-08-18merge-base --independent to print reduced parent list in a mergeLibravatar Jonathan Nieder3-7/+62
2010-08-18merge-base --octopus to mimic show-branch --merge-baseLibravatar Jonathan Nieder3-10/+46
2010-08-18Documentation: add a SEE ALSO section for merge-baseLibravatar Jonathan Nieder1-0/+6
2010-08-18t6200 (fmt-merge-msg): style nitpicksLibravatar Jonathan Nieder1-160/+120
2010-08-18t6010 (merge-base): modernize styleLibravatar Jonathan Nieder1-143/+160
2010-08-18t7600 (merge): test merge from branch yet to be bornLibravatar Jonathan Nieder1-0/+21
2010-08-18t7600 (merge): check reflog entryLibravatar Jonathan Nieder1-1/+7
2010-08-18t7600 (merge): do not launch gitk for --debugLibravatar Jonathan Nieder1-29/+29
2010-08-18t7600 (merge): modernize styleLibravatar Jonathan Nieder1-187/+101
2010-08-18merge: do not mistake (ancestor of) tag for branchLibravatar Jonathan Nieder2-5/+13
2010-08-18submodule sync: Update "submodule.<name>.url"Libravatar David Aguilar2-1/+5
2010-08-18tests: fix syntax error in "Use advise() for hints" testLibravatar Ævar Arnfjörð Bjarmason1-5/+5
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Libravatar Junio C Hamano5-18/+41
2010-08-18Merge branch 'tf/string-list-init'Libravatar Junio C Hamano16-31/+36
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano7-49/+62
2010-08-18Merge branch 'jn/maint-plug-leak'Libravatar Junio C Hamano3-3/+13
2010-08-18Merge branch 'jl/submodule-ignore-diff'Libravatar Junio C Hamano17-21/+526
2010-08-18Merge branch 'ml/rebase-x-strategy'Libravatar Junio C Hamano3-1/+39
2010-08-18Merge branch 'jn/fix-abbrev'Libravatar Junio C Hamano5-4/+3
2010-08-18Merge branch 'vs/doc-spell'Libravatar Junio C Hamano9-16/+18
2010-08-18Merge branch 'jh/use-test-must-fail'Libravatar Junio C Hamano11-26/+26
2010-08-18Merge branch 'jh/clean-exclude'Libravatar Junio C Hamano3-2/+39
2010-08-18Merge branch 'kf/post-receive-sample-hook'Libravatar Junio C Hamano1-2/+32
2010-08-18Merge branch 'ab/report-corrupt-object-with-type'Libravatar Junio C Hamano1-2/+11
2010-08-18Merge branch 'jn/rebase-rename-am'Libravatar Junio C Hamano5-202/+345
2010-08-18Merge branch 'jn/fast-import-subtree'Libravatar Junio C Hamano3-11/+75
2010-08-18Merge branch 'ar/string-list-foreach'Libravatar Junio C Hamano5-104/+67
2010-08-18Merge branch 'jh/graph-next-line'Libravatar Junio C Hamano2-23/+55
2010-08-18Merge branch 'tr/xsize-bits'Libravatar Junio C Hamano1-0/+2
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictLibravatar Elijah Newren2-1/+2
2010-08-18t6031: Add a testcase covering multiple renames across a D/F conflictLibravatar Elijah Newren1-0/+31
2010-08-18merge-recursive: Fix typoLibravatar Elijah Newren1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 19:04:13 +0000