.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DESCRIBE" "1" "10/03/2006" "" ""
+.TH "GIT\-DESCRIBE" "1" "01/15/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
git\-describe \- Show the most recent tag that is reachable from a commit
.SH "SYNOPSIS"
\fIgit\-describe\fR [\-\-all] [\-\-tags] [\-\-abbrev=<n>] <committish>\&...
-.sp
.SH "DESCRIPTION"
The command finds the most recent tag that is reachable from a commit, and if the commit itself is pointed at by the tag, shows the tag. Otherwise, it suffixes the tag name with abbreviated object name of the commit.
-.sp
.SH "OPTIONS"
.TP
<committish>
The object name of the committish.
.TP
\-\-all
-Instead of using only the annotated tags, use any ref found in
-.git/refs/.
+Instead of using only the annotated tags, use any ref found in .git/refs/.
.TP
\-\-tags
-Instead of using only the annotated tags, use any tag found in
-.git/refs/tags.
+Instead of using only the annotated tags, use any tag found in .git/refs/tags.
.TP
\-\-abbrev=<n>
Instead of using the default 8 hexadecimal digits as the abbreviated object name, use <n> digits.
+.TP
+\-\-candidates=<n>
+Instead of considering only the 10 most recent tags as candidates to describe the input committish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result.
+.TP
+\-\-debug
+Verbosely display information about the searching strategy being employed to standard error. The tag name will still be printed to standard out.
.SH "EXAMPLES"
With something like git.git current tree, I get:
.sp
-.sp
.nf
[torvalds@g5 git]$ git\-describe parent
v1.0.4\-g2414721b
.fi
i.e. the current head of my "parent" branch is based on v1.0.4, but since it has a few commits on top of that, it has added the git hash of the thing to the end: "\-g" + 8\-char shorthand for the commit 2414721b194453f058079d897d13c4e377f92dc6.
-.sp
+
Doing a "git\-describe" on a tag\-name will just show the tag name:
.sp
-.sp
.nf
[torvalds@g5 git]$ git\-describe v1.0.4
v1.0.4
.fi
With \-\-all, the command can use branch heads as references, so the output shows the reference path as well:
.sp
-.sp
.nf
[torvalds@g5 git]$ git describe \-\-all \-\-abbrev=4 v1.0.5^2
tags/v1.0.0\-g975b
[torvalds@g5 git]$ git describe \-\-all HEAD^
heads/lt/describe\-g975b
.fi
+.SH "SEARCH STRATEGY"
+For each committish supplied "git describe" will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match is found, its name will be output and searching will stop.
+
+If an exact match was not found "git describe" will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an abbreviation of the input committish's SHA1.
+
+If multiple tags were found during the walk then the tag which has the fewest commits different from the input committish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by "git log tag..input" will be the smallest number of commits possible.
.SH "AUTHOR"
Written by Linus Torvalds <torvalds@osdl.org>, but somewhat butchered by Junio C Hamano <junkio@cox.net>
-.sp
.SH "DOCUMENTATION"
Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger.kernel.org>.
-.sp
.SH "GIT"
Part of the \fBgit\fR(7) suite
-.sp
+
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-LOG" "1" "12/31/2006" "" ""
+.TH "GIT\-LOG" "1" "01/15/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
\-\-encoding[=<encoding>]
The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re\-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF\-8.
.TP
-\-\-max\-count=<n>
+\-<n>
Limits the number of commits to show.
.TP
<since>..<until>
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-PULL" "1" "01/02/2007" "" ""
+.TH "GIT\-PULL" "1" "01/15/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
Merge into the current branch the remote branch next; leaves a copy of next temporarily in FETCH_HEAD, but does not update any remote\-tracking branches.
.TP
git pull . fixes enhancements
-Bundle local branch fixes and enhancements on top of the current branch, making an Octopus merge.
+Bundle local branch fixes and enhancements on top of the current branch, making an Octopus merge. This git pull . syntax is equivalent to git merge.
.TP
git pull \-s ours . obsolete
Merge local branch obsolete into the current branch, using ours merge strategy.
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REPO\-CONFIG" "1" "01/13/2007" "" ""
+.TH "GIT\-REPO\-CONFIG" "1" "01/15/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
merge.summary
Whether to include summaries of merged commits in newly created merge commit messages. False by default.
.TP
+merge.verbosity
+Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2.
+.TP
pack.window
The size of the window used by \fBgit\-pack\-objects\fR(1) when no window size is given on the command line. Defaults to 10.
.TP
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RERERE" "1" "12/27/2006" "" ""
+.TH "GIT\-RERERE" "1" "01/15/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
$ git checkout topic
- $ git pull . master
+ $ git merge master
o\-\-\-*\-\-\-o\-\-\-+ topic
/ /
.sp
.nf
$ git checkout topic
- $ git pull . master
+ $ git merge master
$ ... work on both topic and master branches
$ git checkout master
- $ git pull . topic
+ $ git merge topic
o\-\-\-*\-\-\-o\-\-\-+\-\-\-o\-\-\-o topic
/ / \\
.sp
.nf
$ git checkout topic
- $ git pull . master
+ $ git merge master
$ git reset \-\-hard HEAD^ ;# rewind the test merge
$ ... work on both topic and master branches
$ git checkout master
- $ git pull . topic
+ $ git merge topic
o\-\-\-*\-\-\-o\-\-\-\-\-\-\-o\-\-\-o topic
/ \\
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-RESET" "1" "12/26/2006" "" ""
+.TH "GIT\-RESET" "1" "01/15/2007" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.sp
.nf
$ git pull \fB(1)\fR
-Trying really trivial in\-index merge...
-fatal: Merge requires file\-level merging
-Nope.
-...
Auto\-merging nitfol
CONFLICT (content): Merge conflict in nitfol
Automatic merge failed/prevented; fix up by hand
projects / git.git / commitdiff