diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:22 -0700 |
| commit | 8a4acc5f4cdd811476ffa0b5c63ae4cc35ef288f (patch) | |
| tree | 2b74cebb26cc6fdeff4c5a7a029fe9b6dcda7f9c /git-merge-octopus.sh | |
| parent | Merge branch 'ew/repack-with-bitmaps-by-default' (diff) | |
| parent | git-prompt: improve cherry-pick/revert detection (diff) | |
| download | tgif-8a4acc5f4cdd811476ffa0b5c63ae4cc35ef288f.tar.xz | |
Merge branch 'pw/prompt-cherry-pick-revert-fix'
When one step in multi step cherry-pick or revert is reset or
committed, the command line prompt script failed to notice the
current status, which has been improved.
* pw/prompt-cherry-pick-revert-fix:
git-prompt: improve cherry-pick/revert detection
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions