diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:05:29 +0900 |
| commit | 6baa11dc2a5bb926e88ee9befe88ecf3318ed83c (patch) | |
| tree | ad7a460b2836dc07870cdbbddec381c4c48840cf /Documentation/git-merge.txt | |
| parent | Start preparation for 2.15.1 (diff) | |
| parent | wt-status: actually ignore submodules when requested (diff) | |
| download | tgif-6baa11dc2a5bb926e88ee9befe88ecf3318ed83c.tar.xz | |
Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint
"git rebase -i" recently started misbehaving when a submodule that
is configured with 'submodule.<name>.ignore' is dirty; this has
been corrected.
* bw/rebase-i-ignored-submodule-fix:
wt-status: actually ignore submodules when requested
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions