summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | difftool --dir-diff: symlink all files matching the working treeJohn Keeping2013-03-143-4/+43
| * | | | | | | | | | | difftool: avoid double slashes in symlink targetsJohn Keeping2013-03-141-1/+3
| * | | | | | | | | | | git-difftool(1): fix formatting of --symlink descriptionJohn Keeping2013-03-141-2/+2
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | git help config: s/insn/instruction/Matthias Krüger2013-03-281-1/+1
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-274-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | More fixes for 1.8.2.1Junio C Hamano2013-03-271-0/+3
| * | | | | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-273-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
| | * | | | | | | | | | | git-commit doc: describe use of multiple `-m` optionsChristian Helmuth2013-03-271-0/+2
| | * | | | | | | | | | | git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă2013-03-271-1/+1
* | | | | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svnJunio C Hamano2013-03-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: Support custom tunnel schemes instead of SSH onlySebastian Schuberth2013-03-271-1/+1
* | | | | | | | | | | | | | Merge branch 'rs/archive-zip-raw-compression'Junio C Hamano2013-03-273-28/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | archive-zip: use deflateInit2() to ask for raw compressed dataRené Scharfe2013-03-163-28/+34
* | | | | | | | | | | | | | | Merge branch 'ap/combine-diff-ignore-whitespace'Junio C Hamano2013-03-272-7/+161
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Allow combined diff to ignore white-spacesAntoine Pelisse2013-03-142-7/+161
* | | | | | | | | | | | | | | More topics from the second batch for 1.8.3Junio C Hamano2013-03-261-14/+8
* | | | | | | | | | | | | | | Merge branch 'jc/reflog-reverse-walk'Junio C Hamano2013-03-263-77/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | refs.c: fix fread error handlingJohn Keeping2013-03-231-1/+1
| * | | | | | | | | | | | | | | reflog: add for_each_reflog_ent_reverse() APIJunio C Hamano2013-03-083-47/+105
| * | | | | | | | | | | | | | | for_each_recent_reflog_ent(): simplify opening of a reflog fileJunio C Hamano2013-03-081-3/+1
| * | | | | | | | | | | | | | | for_each_reflog_ent(): extract a helper to process a single entryJunio C Hamano2013-03-081-29/+30
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'kb/p4merge'Junio C Hamano2013-03-264-35/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | merge-one-file: force content conflict for "both sides added" caseJunio C Hamano2013-03-251-5/+2
| * | | | | | | | | | | | | | | git-merge-one-file: send "ERROR:" messages to stderrKevin Bracey2013-03-251-7/+7
| * | | | | | | | | | | | | | | git-merge-one-file: style cleanupKevin Bracey2013-03-251-9/+17
| * | | | | | | | | | | | | | | merge-one-file: remove stale commentJunio C Hamano2013-03-251-2/+0
| * | | | | | | | | | | | | | | mergetools/p4merge: create a base if none availableKevin Bracey2013-03-134-14/+28
| * | | | | | | | | | | | | | | mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey2013-03-131-1/+1
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-03-262-3/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | More corrections for 1.8.2.1Junio C Hamano2013-03-261-0/+39
| * | | | | | | | | | | | | | | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-261-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Correct the docs about GIT_SSH.Dan Bornstein2013-03-261-3/+6
| * | | | | | | | | | | | | | | Merge branch 'we/submodule-update-prefix-output' into maintJunio C Hamano2013-03-262-14/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/mailsplit-maildir-muttsort' into maintJunio C Hamano2013-03-261-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/zip-compresssed-size-with-export-subst' into maintJunio C Hamano2013-03-262-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'jk/utf-8-can-be-spelled-differently' into maintJunio C Hamano2013-03-261-2/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2013-03-262-0/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/perl-cat-blob' into maintJunio C Hamano2013-03-261-10/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano2013-03-261-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maintJunio C Hamano2013-03-261-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-push-refspec-default-doc' into maintJunio C Hamano2013-03-261-9/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'wk/user-manual-literal-format' into maintJunio C Hamano2013-03-261-142/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-263-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Second wave of topics toward 1.8.3Junio C Hamano2013-03-251-7/+58
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref'Junio C Hamano2013-03-259-27/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \