Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-10 01:25:42 +0300
committerJunio C Hamano <gitster@pobox.com>2019-07-10 01:25:42 +0300
commit92f66fd43b6968da9f14478aa9060ce85f8e3586 (patch)
tree50b1640726c2765eb317f317878db040cb511c51 /wt-status.h
parent892d3fb71e75849811c038b9fcaf17188a9ccf5d (diff)
parent28438e84e046984afc76dc891a49bd0862d555f7 (diff)
Merge branch 'md/sort-detached-head-first'
"git branch --list" learned to always output the detached HEAD as the first item (when the HEAD is detached, of course), regardless of the locale. * md/sort-detached-head-first: ref-filter: sort detached HEAD lines firstly
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h
index 64f1ddc9fd..b0cfdc8011 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -65,6 +65,9 @@ enum wt_status_format {
STATUS_FORMAT_UNSPECIFIED
};
+#define HEAD_DETACHED_AT _("HEAD detached at ")
+#define HEAD_DETACHED_FROM _("HEAD detached from ")
+
struct wt_status_state {
int merge_in_progress;
int am_in_progress;