aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-11 01:54:46 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-11 01:54:46 -0700
commit1c536069780bc67c05e621f0485f787d04559f24 (patch)
tree671a0f4b114d7fec8644a5e07d09ab355a654f85 /builtin-merge-recursive.c
parentupdate 'git rebase' documentation (diff)
parentMerge branch 'kb/maint-filter-branch-disappear' into maint (diff)
downloadgit-1c536069780bc67c05e621f0485f787d04559f24.tar.gz
git-1c536069780bc67c05e621f0485f787d04559f24.zip
Merge branch 'maint'
* maint: git-pull documentation: warn about the option order
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions