aboutsummaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorRalf Thielow <ralf.thielow@gmail.com>2013-10-11 17:58:37 +0200
committerJonathan Nieder <jrnieder@gmail.com>2013-10-11 10:42:45 -0700
commitbffd8098705ffcfeb267951dcdd4e49dd188a7bb (patch)
treed8b107469d52e44ae8fffd0fd2b8125fc35c390b /wt-status.h
parent59c222052801a55bb40a78378ea19c6b7c4ec45d (diff)
downloadgit-bffd8098705ffcfeb267951dcdd4e49dd188a7bb.tar.gz
git-bffd8098705ffcfeb267951dcdd4e49dd188a7bb.tar.xz
status: show commit sha1 in "You are currently cherry-picking" message
Especially helpful when cherry-picking multiple commits. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h
index 9341c569a..6c29e6f5e 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -88,6 +88,7 @@ struct wt_status_state {
char *detached_from;
unsigned char detached_sha1[20];
unsigned char revert_head_sha1[20];
+ unsigned char cherry_pick_head_sha1[20];
};
void wt_status_prepare(struct wt_status *s);