summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-281-4/+3
|\
| * blame: require 0 context lines while finding moved lines with -Mks/blame-move-no-reason-for-1-line-contextdk/blame-move-no-reason-for-1-line-contextDavid Kastrup2016-05-291-4/+3
* | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-281-8/+8
|\ \
| * | am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3wayJohannes Schindelin2016-07-081-8/+8
* | | Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-281-1/+1
|\ \ \
| * | | gc: fix off-by-one error with gc.autoPackLimitew/gc-auto-pack-limit-fixEric Wong2016-06-271-1/+1
* | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-281-2/+2
|\ \ \ \
| * | | | grep: fix grepping for "intent to add" filesnd/ita-cleanupCharles Bailey2016-07-011-2/+2
* | | | | Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-282-2/+2
|\ \ \ \ \
| * | | | | reset --hard: skip blank lines when reporting the commit subjectjs/find-commit-subject-ignore-leading-blanksJohannes Schindelin2016-06-291-1/+1
| * | | | | commit -C: skip blank lines at the beginning of the messageJohannes Schindelin2016-06-291-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano2016-07-111-3/+2
|\ \ \ \ \
| * | | | | clone: do not let --depth imply --shallow-submodulessb/clone-shallow-passthruJunio C Hamano2016-06-201-3/+2
* | | | | | Merge branch 'km/fetch-do-not-free-remote-name' into maintJunio C Hamano2016-07-111-4/+2
|\ \ \ \ \ \
| * | | | | | builtin/fetch.c: don't free remote->name after fetchkm/fetch-do-not-free-remote-nameKeith McGuigan2016-06-141-4/+2
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-064-0/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-311-6/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-264-14/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'va/i18n-remote-comment-to-align' into maintJunio C Hamano2016-05-261-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-181-2/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-181-1/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2016-05-181-9/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/apply' into maintJunio C Hamano2016-05-061-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-021-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-021-23/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-021-7/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-021-8/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/check-repository-format' into maintJunio C Hamano2016-05-021-21/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-061-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tagJunio C Hamano2016-06-141-4/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-063-11/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-073-11/+26
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-271-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | rev-list: disable bitmaps when "-n" is used with listing objectsjk/rev-list-count-with-bitmapJeff King2016-06-031-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-031-0/+3
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-helper-relative-path'Junio C Hamano2016-06-061-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | submodule: remove bashism from shell scriptsb/submodule-helper-relative-pathStefan Beller2016-06-011-0/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-helper-list-signal-unmatch-via-exit-status'Junio C Hamano2016-06-061-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper: offer a consistent APIsb/submodule-helper-list-signal-unmatch-via-exit-statusStefan Beller2016-06-011-3/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/apply-name-terminate'Junio C Hamano2016-06-031-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | apply: remove unused parameters from name_terminate()rs/apply-name-terminateRené Scharfe2016-05-291-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/patch-id-use-skip-prefix'Junio C Hamano2016-06-031-13/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | patch-id: use starts_with() and skip_prefix()rs/patch-id-use-skip-prefixRené Scharfe2016-05-291-13/+10
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/cat-file-buffered-batch-all'Junio C Hamano2016-05-311-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | cat-file: default to --buffer when --batch-all-objects is usedjk/cat-file-buffered-batch-allJeff King2016-05-181-0/+4