diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-02-03 12:53:27 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 08:21:02 -0800 |
commit | 0722c805d616eb644a868a995b891470f9e5e30d (patch) | |
tree | ecb970d3b6c033b2334945c540a6de26e732ac61 /wt-status.h | |
parent | bcd45b4085f9269a536c8fb1963ac8380bfac0e8 (diff) | |
download | git-0722c805d616eb644a868a995b891470f9e5e30d.tar.gz git-0722c805d616eb644a868a995b891470f9e5e30d.tar.xz |
status: show the branch name if possible in in-progress info
The typical use-case is starting a rebase, do something else, come
back the day after, run "git status" or make a new commit and wonder
what in the world's going on. Which branch is being rebased is
probably the most useful tidbit to help, but the target may help
too.
Ideally, I would have loved to see "rebasing master on
origin/master", but the target ref name is not stored during rebase,
so this patch writes "rebasing master on a78c8c98b" as a
half-measure to remind future users of that potential improvement.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
-rw-r--r-- | wt-status.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h index 236b41fd3..81e1dcf84 100644 --- a/wt-status.h +++ b/wt-status.h @@ -79,6 +79,8 @@ struct wt_status_state { int rebase_interactive_in_progress; int cherry_pick_in_progress; int bisect_in_progress; + const char *branch; + const char *onto; }; void wt_status_prepare(struct wt_status *s); |