summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-08-20 16:18:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-20 16:18:16 -0700
commite28a8670a66125aa29d7a5ea10052c0f6824c2ba (patch)
tree6506300a0123f026feabacf2eae76a665390c8eb /Documentation
parentMerge branch 'bd/diff-strbuf' (diff)
parentUpdate draft release notes for 1.6.0.1 (diff)
downloadtgif-e28a8670a66125aa29d7a5ea10052c0f6824c2ba.tar.xz
Merge branch 'maint'
* maint: Update draft release notes for 1.6.0.1 Add hints to revert documentation about other ways to undo changes Install templates with the user and group of the installing personality "git-merge": allow fast-forwarding in a stat-dirty tree completion: find out supported merge strategies correctly decorate: allow const objects to be decorated for-each-ref: cope with tags with incomplete lines diff --check: do not get confused by new blank lines in the middle remote.c: remove useless if-before-free test mailinfo: avoid violating strbuf assertion git format-patch: avoid underrun when format.headers is empty or all NLs
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.6.0.1.txt20
-rw-r--r--Documentation/git-revert.txt9
2 files changed, 27 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.6.0.1.txt b/Documentation/RelNotes-1.6.0.1.txt
index 3ee85a7993..bac117e89d 100644
--- a/Documentation/RelNotes-1.6.0.1.txt
+++ b/Documentation/RelNotes-1.6.0.1.txt
@@ -4,12 +4,28 @@ GIT v1.6.0.1 Release Notes
Fixes since v1.6.0
------------------
-* ...
+* "git diff --check" incorrectly detected new trailing blank lines when
+ whitespace check was in effect.
+
+* "git for-each-ref" tried to dereference NULL when asked for '%(body)" on
+ a tag with a single incomplete line as its payload.
+
+* "git format-patch" peeked before the beginning of a string when
+ "format.headers" variable is empty (a misconfiguration).
+
+* "git mailinfo" (hence "git am") was unhappy when MIME multipart message
+ contained garbage after the finishing boundary.
+
+* "git mailinfo" also was unhappy when the "From: " line only had a bare
+ e-mail address.
+
+* "git merge" did not refresh the index correctly when a merge resulted in
+ a fast-forward.
Contains other various documentation fixes.
--
exec >/var/tmp/1
-O=v1.6.0
+O=v1.6.0-14-g3a634dc
echo O=$(git describe maint)
git shortlog --no-merges $O..maint
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 98cfa3c0d0..caa07298a6 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -15,6 +15,15 @@ Given one existing commit, revert the change the patch introduces, and record a
new commit that records it. This requires your working tree to be clean (no
modifications from the HEAD commit).
+Note: 'git revert' is used to record a new commit to reverse the
+effect of an earlier commit (often a faulty one). If you want to
+throw away all uncommitted changes in your working directory, you
+should see linkgit:git-reset[1], particularly the '--hard' option. If
+you want to extract specific files as they were in another commit, you
+should see linkgit:git-checkout[1], specifically the 'git checkout
+<commit> -- <filename>' syntax. Take care with these alternatives as
+both will discard uncommitted changes in your working directory.
+
OPTIONS
-------
<commit>::