author | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Mar 2010 06:27:04 +0000 (22:27 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Mar 2010 06:27:04 +0000 (22:27 -0800) |
* jn/maint-fix-pager:
tests: Fix race condition in t7006-pager
t7006-pager: if stdout is not a terminal, make a new one
tests: Add tests for automatic use of pager
am: Fix launching of pager
git svn: Fix launching of pager
git.1: Clarify the behavior of the --paginate option
Make 'git var GIT_PAGER' always print the configured pager
Fix 'git var' usage synopsis
tests: Fix race condition in t7006-pager
t7006-pager: if stdout is not a terminal, make a new one
tests: Add tests for automatic use of pager
am: Fix launching of pager
git svn: Fix launching of pager
git.1: Clarify the behavior of the --paginate option
Make 'git var GIT_PAGER' always print the configured pager
Fix 'git var' usage synopsis
1 | 2 | |||
---|---|---|---|---|
Documentation/git.txt | patch | | diff1 | | diff2 | | blob | history |
git-am.sh | patch | | diff1 | | diff2 | | blob | history |
git-sh-setup.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git.txt
Simple merge
diff --cc git-am.sh
Simple merge
diff --cc git-sh-setup.sh
Simple merge