projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e8fe0d 212de74)
Merge branch 'mg/status-in-progress-info' into pu
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Feb 2018 22:47:42 +0000 (14:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Feb 2018 22:47:42 +0000 (14:47 -0800)
commit9501feab7844e46e43e60e5a638149b9f1cdbe16
tree4dfa455663246c86f03fb83422426d1e512d7f79tree | snapshot
parent5e8fe0d76da9c6408d6d969cc1fa9f6324e92adfcommit | diff
parent212de7445d463405f01efe2bcae8419c8873bb56commit | diff
Merge branch 'mg/status-in-progress-info' into pu

"git status" learns an option to report various operations
(e.g. "merging") that the user is in the middle of.

cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>

* mg/status-in-progress-info:
  status --short --inprogress: spell it as --in-progress
  status: show in-progress info for short status
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/git-status.txt diff1 | diff2 | blob | history
builtin/commit.c diff1 | diff2 | blob | history
wt-status.c diff1 | diff2 | blob | history
wt-status.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.