summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: fix parsing of "diff-algorithm" optionjk/diff-algoJohn Keeping2013-09-261-2/+2
* diff: allow unstuck arguments with --diff-algorithmJohn Keeping2013-04-051-2/+3
* git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping2013-04-051-0/+6
* diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-165-1/+53
* config: Introduce diff.algorithm variableMichal Privoznik2013-01-163-0/+42
* git-completion.bash: Autocomplete --minimal and --histogram for git-diffMichal Privoznik2013-01-141-1/+1
* Update draft release notes to 1.8.2Junio C Hamano2013-01-111-0/+15
* Merge branch 'jk/maint-fast-import-doc-reorder'Junio C Hamano2013-01-111-46/+52
|\
| * git-fast-import(1): reorganise optionsJohn Keeping2013-01-091-39/+47
| * git-fast-import(1): combine documentation of --[no-]relative-marksJohn Keeping2013-01-091-6/+4
* | Merge branch 'jk/shortlog-no-wrap-doc'Junio C Hamano2013-01-111-0/+3
|\ \
| * | git-shortlog(1): document behaviour of zero-width wrapJohn Keeping2013-01-091-0/+3
* | | Merge branch 'rs/zip-with-uncompressed-size-in-the-header'Junio C Hamano2013-01-111-5/+2
|\ \ \
| * | | archive-zip: write uncompressed size into header even with streamingRené Scharfe2013-01-061-5/+2
* | | | Merge branch 'rs/zip-tests'Junio C Hamano2013-01-115-80/+140
|\ \ \ \
| * | | | t5003: check if unzip supports symlinksRené Scharfe2013-01-072-7/+19
| * | | | t5000, t5003: move ZIP tests into their own scriptRené Scharfe2013-01-072-69/+119
| * | | | t0024, t5000: use test_lazy_prereq for UNZIPRené Scharfe2013-01-072-14/+10
| * | | | t0024, t5000: clear variable UNZIP, use GIT_UNZIP insteadRené Scharfe2013-01-063-8/+10
* | | | | Merge branch 'jn/xml-depends-on-asciidoc-conf'Junio C Hamano2013-01-111-5/+3
|\ \ \ \ \
| * | | | | docs: manpage XML depends on asciidoc.confJonathan Nieder2013-01-061-5/+3
| |/ / / /
* | | | | Merge branch 'jk/unify-exit-code-by-receiving-signal'Junio C Hamano2013-01-114-7/+5
|\ \ \ \ \
| * | | | | run-command: encode signal death as a positive integerJeff King2013-01-064-7/+5
* | | | | | Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-118-50/+117
|\ \ \ \ \ \
| * | | | | | merge-tree: fix d/f conflictsJunio C Hamano2012-12-262-34/+42
| * | | | | | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-262-4/+66
| * | | | | | merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
| * | | | | | merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
| * | | | | | Which merge_file() function do you mean?Junio C Hamano2012-12-097-17/+18
* | | | | | | Merge branch 'jc/format-patch-reroll'Junio C Hamano2013-01-116-33/+84
|\ \ \ \ \ \ \
| * | | | | | | format-patch: give --reroll-count a short synonym -vJunio C Hamano2013-01-033-2/+11
| * | | | | | | format-patch: document and test --reroll-countJunio C Hamano2013-01-022-1/+17
| * | | | | | | format-patch: add --reroll-count=$N optionJunio C Hamano2012-12-223-0/+14
| * | | | | | | get_patch_filename(): split into two functionsJunio C Hamano2012-12-213-22/+28
| * | | | | | | get_patch_filename(): drop "just-numbers" hackJunio C Hamano2012-12-212-16/+18
| * | | | | | | get_patch_filename(): simplify function signatureJunio C Hamano2012-12-213-7/+12
| * | | | | | | builtin/log.c: stop using global patch_suffixJunio C Hamano2012-12-211-2/+2
| * | | | | | | builtin/log.c: drop redundant "numbered_files" parameter from make_cover_lett...Junio C Hamano2012-12-211-7/+6
| * | | | | | | builtin/log.c: drop unused "numbered" parameter from make_cover_letter()Junio C Hamano2012-12-211-2/+2
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-01-110-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'as/api-allocation-doc' into maintJunio C Hamano2013-01-111-6/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/enable-test-lint-by-default' into maintJunio C Hamano2013-01-111-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-112-2/+17
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/submittingpatches' into maintJunio C Hamano2013-01-111-84/+91
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'os/gitweb-highlight-uncaptured' into maintJunio C Hamano2013-01-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-01-111-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kb/maint-bundle-doc' into maintJunio C Hamano2013-01-111-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/test-name-alias-uniquely' into maintJunio C Hamano2013-01-111-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/warn-on-inaccessible-loosen' into maintJunio C Hamano2013-01-115-7/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ja/directory-attrs' into maintJunio C Hamano2013-01-113-9/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status