diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-11 00:53:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-11 00:53:31 -0700 |
| commit | 10d9d887ecdc81197162d7bbe5dfc0d028498fd6 (patch) | |
| tree | f726621f79162565bf066400df697a078680601a /Documentation | |
| parent | Update draft RelNotes for 1.6.0 (diff) | |
| parent | Documentation: fix invalid reference to 'mybranch' in user manual (diff) | |
| download | tgif-10d9d887ecdc81197162d7bbe5dfc0d028498fd6.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: fix invalid reference to 'mybranch' in user manual
Fix deleting reflog entries from HEAD reflog
reflog test: add more tests for 'reflog delete'
Documentation: rev-list-options: Fix -g paragraph formatting
Conflicts:
Documentation/user-manual.txt
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/rev-list-options.txt | 4 | ||||
| -rw-r--r-- | Documentation/user-manual.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 3aa38097e6..9e20713664 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -264,10 +264,10 @@ With '\--pretty' format other than oneline (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. By default, 'commit@\{Nth}' notation is used in the output. When the starting commit is specified as -'commit@{now}', output also uses 'commit@\{timestamp}' notation +'commit@\{now}', output also uses 'commit@\{timestamp}' notation instead. Under '\--pretty=oneline', the commit message is prefixed with this information on the same line. - ++ Cannot be combined with '\--reverse'. See also linkgit:git-reflog[1]. diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f421689942..e99921108e 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2825,8 +2825,8 @@ You can also add a "+" to force the update each time: $ git config remote.example.fetch +master:ref/remotes/example/master ------------------------------------------------- -Don't do this unless you're sure you won't mind "git-fetch" possibly -throwing away commits on mybranch. +Don't do this unless you're sure you won't mind "git fetch" possibly +throwing away commits on 'example/master'. Also note that all of the above configuration can be performed by directly editing the file .git/config instead of using |