aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-01 16:20:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-01 16:20:11 -0700
commitb46c9fafcf5450196b003ba63d32bab6c479d23a (patch)
tree6143994b332c0c5f933352a2734970e568dfcc59 /builtin/commit.c
parentMerge branch 'js/checkout-untracked-symlink' into maint (diff)
parentapply: do not patch lines that were already patched (diff)
downloadgit-b46c9fafcf5450196b003ba63d32bab6c479d23a.tar.gz
git-b46c9fafcf5450196b003ba63d32bab6c479d23a.zip
Merge branch 'jc/maint-apply-no-double-patch' into maint
* jc/maint-apply-no-double-patch: apply: do not patch lines that were already patched
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions