summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-11 23:56:09 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-11 23:56:09 -0700
commit4cdda2b895dfb6ba084e3952cbf4274a6a2e0338 (patch)
treed924f60957a287ea138ce59580c05e71e3f9c2f1 /ll-merge.c
parent243a60fbb5e185e2bf3c4bb1c53128b4d04d5879 (diff)
parenteed81838f0d0e031702473e1d427d71055134edd (diff)
downloadgit-4cdda2b895dfb6ba084e3952cbf4274a6a2e0338.tar.gz
Merge branch 'maint'
* maint: bisect: fix bad rev checking in "git bisect good" revision.c: make --date-order overriddable git-submodule: Avoid 'fatal: cannot describe' message Force the medium pretty format on calls to git log Fix section about backdating tags in the git-tag docs Document option --only of git commit Documentation/git-request-pull: Fixed a typo ("send" -> "end")
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions