aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-08-23 19:49:34 +0200
committerJunio C Hamano <gitster@pobox.com>2017-08-23 12:02:47 -0700
commit3c82eec8fbae30860c58afba11e8b48186a06c35 (patch)
tree83369af2c09f7e7d933cc12e074f964dffbd218c /contrib/examples/git-resolve.sh
parentGit 2.14.1 (diff)
downloadgit-3c82eec8fbae30860c58afba11e8b48186a06c35.tar.gz
git-3c82eec8fbae30860c58afba11e8b48186a06c35.zip
Documentation/user-manual: update outdated example output
Since commit f7673490 ("more terse push output", 2007-11-05), git push has a completely different output format than the one shown in the user manual for a non-fast-forward push. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions