Skip to main content

Browse the archive

Revision c7cb333f60db9b8313da75c2075a3619202e905d authored by Junio C Hamano on 12 March 2014, 20:43:51 UTC, committed by Junio C Hamano on 12 March 2014, 21:08:05 UTC 
wt-status: lift the artificual "at least 20 columns" floor
 
When we show unmerged paths, we had an artificial 20 columns floor
for the width of labels (e.g. "both deleted:") shown next to the
pathnames.  Depending on the locale, this may result in a label that
is too wide when all the label strings are way shorter than 20
columns, or no-op when a label string is longer than 20 columns.

Just drop the artificial floor.  The screen real estate is better
utilized this way when all the strings are shorter.

Adjust the tests to this change.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8f17f5b
Raw File
git-mktree.txt 
git-mktree(1)
=============

NAME
----
git-mktree - Build a tree-object from ls-tree formatted text


SYNOPSIS
--------
[verse]
'git mktree' [-z] [--missing] [--batch]

DESCRIPTION
-----------
Reads standard input in non-recursive `ls-tree` output format, and creates
a tree object.  The order of the tree entries is normalised by mktree so
pre-sorting the input is not required.  The object name of the tree object
built is written to the standard output.

OPTIONS
-------
-z::
	Read the NUL-terminated `ls-tree -z` output instead.

--missing::
	Allow missing objects.  The default behaviour (without this option)
	is to verify that each tree entry's sha1 identifies an existing
	object.  This option has no effect on the treatment of gitlink entries
	(aka "submodules") which are always allowed to be missing.

--batch::
	Allow building of more than one tree object before exiting.  Each
	tree is separated by as single blank line. The final new-line is
	optional.  Note - if the '-z' option is used, lines are terminated
	with NUL.

GIT
---
Part of the linkgit:git[1] suite
back to top