aboutsummaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-18 14:36:00 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-18 14:36:00 -0700
commit3387423870e2efbc0b1bf7478a03320e55d2f0bc (patch)
treec5348a045cce07f674fc28e5facf0f5e0d6746da /lockfile.c
parentd71abd99f82e7076775f12deb9326f7d26761591 (diff)
parent5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f (diff)
downloadgit-3387423870e2efbc0b1bf7478a03320e55d2f0bc.tar.gz
git-3387423870e2efbc0b1bf7478a03320e55d2f0bc.tar.xz
Merge branch 'mv/cherry-pick-s'
After "git cherry-pick -s" gave control back to the user asking help to resolve conflicts, concluding "git commit" needs to be run with "-s" if the user wants to sign it off, but the command should be able to remember that. * mv/cherry-pick-s: cherry-pick: don't forget -s on failure
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions