diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:29:54 -0800 |
| commit | 55f9c8351d8bf0aca18cb3472ec081ad57c96543 (patch) | |
| tree | b5d6cc3df06eadd220e16e41cbd35bdaee2ca11d /git-merge-one-file.sh | |
| parent | 97a8f025e5d9e582c38864e0c2e3e8006856cfba (diff) | |
| parent | 0722c805d616eb644a868a995b891470f9e5e30d (diff) | |
| download | git-55f9c8351d8bf0aca18cb3472ec081ad57c96543.tar.gz | |
Merge branch 'nd/status-show-in-progress'
* nd/status-show-in-progress:
status: show the branch name if possible in in-progress info
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions