summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Merge branch 'jk/maint-fast-import-doc-reorder' into maintJunio C Hamano2013-01-141-46/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/shortlog-no-wrap-doc' into maintJunio C Hamano2013-01-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-fast-import-doc-dedup-done' into maintJunio C Hamano2013-01-141-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/comment-cygwin-win32api-in-makefile' into maintJunio C Hamano2013-01-141-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maintJunio C Hamano2013-01-141-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-142-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-143-8/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano2013-01-141-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pf/editor-ignore-sigint' into maintJunio C Hamano2013-01-142-7/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/maint-graph-infinity-loop' into maintJunio C Hamano2013-01-143-6/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-01-141-0/+12
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-142-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | blame: pay attention to --no-followJunio C Hamano2012-09-211-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | diff: accept --no-follow optionJunio C Hamano2012-09-211-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/remote-testgit-feature-done'Junio C Hamano2013-01-142-0/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | remote-testgit: properly check for errorsFelipe Contreras2012-10-292-0/+29
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/upload-pack-shallow-must-be-commit'Junio C Hamano2013-01-141-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | upload-pack: only accept commits from "shallow" lineNguyễn Thái Ngọc Duy2013-01-081-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ap/status-ignored-in-ignored-directory'Junio C Hamano2013-01-143-22/+225
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | status: always report ignored tracked directoriesAntoine Pelisse2013-01-071-6/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-status: Test --ignored behaviorAntoine Pelisse2013-01-011-0/+146
| * | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c: Make git-status --ignored more consistentAntoine Pelisse2013-01-012-21/+81
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nz/send-email-headers-are-case-insensitive'Junio C Hamano2013-01-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | git-send-email: treat field names as case-insensitivelyNickolai Zeldovich2013-01-061-5/+5
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | 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