summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation formatting and cleanupJonathan Nieder2008-07-01103-509/+510
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-01131-462/+462
* Documentation: prepare to be consistent about "git-" versus "git "Jonathan Nieder2008-07-014-10/+10
* git-daemon(1): don't assume git-daemon is in /usr/binJonathan Nieder2008-07-011-5/+5
* Documentation: complicate example of "man git-command"Jonathan Nieder2008-07-012-3/+3
* whitespace fix in Documentation/git-repack.txtJonathan Nieder2008-07-011-3/+3
* Documentation: fix links to tutorials and other new manual pagesJonathan Nieder2008-07-0111-42/+38
* Merge maint inJunio C Hamano2008-07-012-1/+32
|\
| * Start draft release notes for 1.5.6.2Junio C Hamano2008-07-012-1/+32
| * Fix 'git show' on signed tag of signed tag of commitThomas Rast2008-07-011-1/+1
* | Merge branch 'ph/mergetool'Junio C Hamano2008-07-011-12/+12
|\ \
| * | Remove the use of '--' in merge program invocationPatrick Higgins2008-06-191-12/+12
* | | Merge branch 'js/apply-recount'Junio C Hamano2008-07-013-43/+101
|\ \ \
| * | | Allow git-apply to recount the lines in a hunk (AKA recountdiff)Johannes Schindelin2008-06-283-43/+101
* | | | Merge branch 'jc/checkdiff'Junio C Hamano2008-07-017-87/+136
|\ \ \ \
| * | | | Fix t4017-diff-retval for white-space from wcBrian Gernhardt2008-06-291-1/+1
| * | | | Update sample pre-commit hook to use "diff --check"Junio C Hamano2008-06-261-58/+6
| * | | | diff --check: detect leftover conflict markersJunio C Hamano2008-06-262-0/+49
| * | | | Teach "diff --check" about new blank lines at endJunio C Hamano2008-06-264-2/+37
| * | | | checkdiff: pass diff_options to the callbackJunio C Hamano2008-06-261-10/+11
| * | | | check_and_emit_line(): rename and refactorJunio C Hamano2008-06-264-16/+25
| * | | | diff --check: explain why we do not care whether old side is binaryJunio C Hamano2008-06-261-2/+9
* | | | | Merge branch 'kb/send-email-fifo'Junio C Hamano2008-07-011-3/+5
|\ \ \ \ \
| * | | | | git-send-email: Accept fifos as well as filesKevin Ballard2008-06-251-3/+5
* | | | | | Merge branch 'tr/send-email-ssl'Junio C Hamano2008-07-012-9/+43
|\ \ \ \ \ \
| * | | | | | git-send-email: prevent undefined variable warnings if no encryption is setThomas Rast2008-06-281-0/+3
| * | | | | | git-send-email: add support for TLS via Net::SMTP::SSLThomas Rast2008-06-252-9/+40
| |/ / / / /
* | | | | | Merge branch 'js/maint-clone-insteadof'Junio C Hamano2008-07-011-1/+9
|\ \ \ \ \ \
| * | | | | | clone: respect the settings in $HOME/.gitconfig and /etc/gitconfigJohannes Schindelin2008-06-291-0/+7
| * | | | | | clone: respect url.insteadOf setting in global configsJohannes Schindelin2008-06-271-1/+2
* | | | | | | Merge branch 'jc/maint-reset'Junio C Hamano2008-07-012-5/+81
|\ \ \ \ \ \ \
| * | | | | | | Allow "git-reset path" when unambiguousJunio C Hamano2008-06-252-5/+81
* | | | | | | | Merge branch 'jk/maint-fetch-ref-hier'Junio C Hamano2008-07-011-16/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: give a hint to the user when local refs fail to updateJeff King2008-06-291-4/+11
| * | | | | | | | fetch: report local storage errors in status tableJeff King2008-06-271-12/+24
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dz/apply-again'Junio C Hamano2008-07-012-10/+157
|\ \ \ \ \ \ \ \
| * | | | | | | | git-apply: handle a patch that touches the same path more than once betterDon Zickus2008-06-272-10/+157
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'np/pack-default'Junio C Hamano2008-07-014-11/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | pack.indexversion config option now defaults to 2Nicolas Pitre2008-06-253-4/+13
| * | | | | | | | repack.usedeltabaseoffset config option now defaults to "true"Nicolas Pitre2008-06-252-7/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/dashless' (early part)Junio C Hamano2008-07-012-20/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Prepare execv_git_cmd() for removal of builtins from the filesystemJunio C Hamano2008-06-232-20/+43
| * | | | | | | | git-shell: accept "git foo" formJunio C Hamano2008-06-231-4/+13
* | | | | | | | | Merge branch 'nd/dashless'Junio C Hamano2008-07-014-9/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Keep some git-* programs in $(bindir)Junio C Hamano2008-06-241-1/+1
| * | | | | | | | | Move all dashed-form commands to libexecdirNguyễn Thái Ngọc Duy2008-06-194-8/+23
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2008-06-301-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | doc/rev-parse: clarify reflog vs --until for specifying revisionsJeff King2008-06-291-1/+4
* | | | | | | | | Add test results directory to t/.gitignoreBrian Gernhardt2008-06-301-0/+1
* | | | | | | | | Update draft release notes for 1.6.0Junio C Hamano2008-06-291-16/+24