diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-10 13:46:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-10 13:46:51 -0800 |
| commit | 6a37cee10abe36fbbf635129d5ae114dbf96d395 (patch) | |
| tree | a2f613ac980ba6d9ea4a1ec84dd168eb131ec680 /git-merge-resolve.sh | |
| parent | Merge branch 'aw/rebase-am-failure-detection' (diff) | |
| parent | learn to pick/revert into unborn branch (diff) | |
| download | tgif-6a37cee10abe36fbbf635129d5ae114dbf96d395.tar.xz | |
Merge branch 'mz/pick-unborn'
Allow "git cherry-pick $commit" even when you do not have any
history behind HEAD yet.
* mz/pick-unborn:
learn to pick/revert into unborn branch
tests: move test_cmp_rev to test-lib-functions
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions