summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2008-07-13reduce_heads(): thinkofixLibravatar Sverre Hvammen Johansen2-1/+12
2008-07-13Add a new test for git-merge-resolveLibravatar Miklos Vajna1-0/+46
2008-07-13t6021: add a new test for git-merge-resolveLibravatar Miklos Vajna1-0/+4
2008-07-10Teach merge.log to "git-merge" againLibravatar Junio C Hamano2-0/+9
2008-07-07Build in mergeLibravatar Miklos Vajna6-2/+1157
2008-07-06Fix t7601-merge-pull-config.sh on AIXLibravatar Miklos Vajna1-7/+7
2008-07-06git-commit-tree: make it usable from other builtinsLibravatar Miklos Vajna2-30/+45
2008-07-06Add new test case to ensure git-merge prepends the custom merge messageLibravatar Miklos Vajna1-0/+37
2008-06-30Add new test case to ensure git-merge reduces octopus parents when possibleLibravatar Miklos Vajna1-0/+63
2008-06-30Introduce reduce_heads()Libravatar Junio C Hamano2-0/+47
2008-06-30Introduce get_merge_bases_many()Libravatar Junio C Hamano1-18/+38
2008-06-30Add new test to ensure git-merge handles more than 25 refs.Libravatar Miklos Vajna1-0/+52
2008-06-30Introduce get_octopus_merge_bases() in commit.cLibravatar Miklos Vajna2-0/+28
2008-06-30git-fmt-merge-msg: make it usable from other builtinsLibravatar Miklos Vajna2-66/+92
2008-06-30Move read_cache_unmerged() to read-cache.cLibravatar Miklos Vajna3-24/+33
2008-06-30Add new test to ensure git-merge handles pull.twohead and pull.octopusLibravatar Miklos Vajna1-0/+129
2008-06-30Move parse-options's skip_prefix() to git-compat-util.hLibravatar Miklos Vajna3-19/+32
2008-06-30Move commit_list_count() to commit.cLibravatar Miklos Vajna3-8/+9
2008-06-30Move split_cmdline() to alias.cLibravatar Miklos Vajna3-53/+55
2008-06-30Merge branch 'maint'Libravatar Junio C Hamano1-1/+4
2008-06-30Add test results directory to t/.gitignoreLibravatar Brian Gernhardt1-0/+1
2008-06-29doc/rev-parse: clarify reflog vs --until for specifying revisionsLibravatar Jeff King1-1/+4
2008-06-29Update draft release notes for 1.6.0Libravatar Junio C Hamano1-16/+24
2008-06-29Documentation: don't assume git-sh-setup and git-parse-remote are in PATHLibravatar jrnieder@uchicago.edu2-2/+2
2008-06-29t9700: skip when Test::More is not availableLibravatar Junio C Hamano1-0/+5
2008-06-28Merge branch 'maint'Libravatar Junio C Hamano4-15/+10
2008-06-28git-svn: don't sanitize remote names in configLibravatar Eric Wong1-12/+3
2008-06-28show_stats(): fix stats width calculationLibravatar Olivier Marin1-6/+6
2008-06-28Documentation: remove {show,whatchanged}.difftree config optionsLibravatar Olivier Marin2-10/+0
2008-06-28git-svn: avoid filling up the disk with temp files.Libravatar Avery Pennarun1-1/+4
2008-06-28git cat-file: Fix memory leak in batch modeLibravatar Björn Steinbrink1-0/+1
2008-06-28fix git config example syntaxLibravatar Joey Hess1-1/+1
2008-06-28avoid off-by-one error in run_upload_archiveLibravatar Jochen Voss1-1/+1
2008-06-28GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copyLibravatar Lea Wiemann1-1/+1
2008-06-27commit-tree: lift completely arbitrary limit of 16 parentsLibravatar Johannes Schindelin1-23/+20
2008-06-27shrink git-shell by avoiding redundant dependenciesLibravatar Dmitry Potapov6-68/+79
2008-06-27help: check early if we have a command, if not try a documentation topicLibravatar Christian Couder1-8/+14
2008-06-27Document the double-dash "rev -- path" disambiguatorLibravatar Junio C Hamano1-4/+33
2008-06-26Don't use dash commands (git-foo) in tutorial-2Libravatar Ted Percival1-5/+5
2008-06-26test-lib.sh: show git init output when in verbose modeLibravatar Lea Wiemann1-1/+1
2008-06-26Merge branch 'maint'Libravatar Junio C Hamano5-7/+80
2008-06-26Merge branch 'maint-1.5.5' into maintLibravatar Junio C Hamano3-4/+67
2008-06-26GIT 1.5.5.5Libravatar Junio C Hamano3-2/+13
2008-06-26Merge branch 'maint-1.5.4' into maint-1.5.5Libravatar Junio C Hamano2-4/+56
2008-06-26GIT 1.5.4.6Libravatar Junio C Hamano3-2/+45
2008-06-26git-shell: accept "git foo" formLibravatar Junio C Hamano1-4/+13
2008-06-26diff --check: do not discard error status upon seeing a good lineLibravatar Junio C Hamano2-3/+13
2008-06-26improve for-each-ref test scriptLibravatar Jeff King1-17/+70
2008-06-26Add 'git-p4.allowSubmit' to git-p4Libravatar Jing Xue1-0/+4
2008-06-26Start draft release notes for 1.6.0Libravatar Junio C Hamano2-1/+106