summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mj/log-show-signature-conf'Junio C Hamano2016-07-111-0/+6
|\
| * log: add log.showSignature configuration variablemj/log-show-signature-confMehul Jain2016-06-241-0/+6
* | Merge branch 'js/find-commit-subject-ignore-leading-blanks'Junio C Hamano2016-07-112-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/submodule-clone-retry'Junio C Hamano2016-07-111-7/+59
|\ \ \
| * | | submodule--helper: initial clone learns retry logicStefan Beller2016-06-131-7/+59
* | | | Merge branch 'sb/clone-shallow-passthru'Junio C Hamano2016-07-061-3/+2
|\ \ \ \
| * | | | clone: do not let --depth imply --shallow-submodulessb/clone-shallow-passthruJunio C Hamano2016-06-201-3/+2
* | | | | Merge branch 'jk/repack-keep-unreachable'Junio C Hamano2016-07-062-0/+41
|\ \ \ \ \
| * | | | | repack: extend --keep-unreachable to loose objectsjk/repack-keep-unreachableJeff King2016-06-142-0/+32
| * | | | | repack: add --keep-unreachable optionJeff King2016-06-141-0/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ew/mboxrd-format-am'Junio C Hamano2016-07-063-4/+30
|\ \ \ \ \
| * | | | | am: support --patch-format=mboxrdew/mboxrd-format-amEric Wong2016-06-061-3/+11
| * | | | | mailsplit: support unescaping mboxrd messagesEric Wong2016-06-061-0/+18
| * | | | | pretty: support "mboxrd" output formatEric Wong2016-06-061-1/+1
* | | | | | Merge branch 'nd/worktree-cleanup-post-head-protection'Junio C Hamano2016-07-061-4/+6
|\ \ \ \ \ \
| * | | | | | worktree: simplify prefixing pathsnd/worktree-cleanup-post-head-protectionNguyễn Thái Ngọc Duy2016-05-241-1/+3
| * | | | | | worktree: avoid 0{40}, too many zeroes, hard to readNguyễn Thái Ngọc Duy2016-05-241-1/+1
| * | | | | | worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy2016-05-241-1/+1
| * | | | | | git-worktree.txt: keep subcommand listing in alphabetical orderNguyễn Thái Ngọc Duy2016-05-241-1/+1
* | | | | | | Merge branch 'km/fetch-do-not-free-remote-name'Junio C Hamano2016-07-061-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 'jk/string-list-static-init'Junio C Hamano2016-07-067-17/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-135-10/+10
| * | | | | | | | | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-initJunio C Hamano2016-06-133-10/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | blame,shortlog: don't make local option variables staticJeff King2016-06-132-9/+9
| | * | | | | | | | | interpret-trailers: don't duplicate option stringsJeff King2016-06-131-1/+1
* | | | | | | | | | | Merge branch 'pb/commit-editmsg-path'Junio C Hamano2016-07-061-7/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/commit.c: memoize git-path for COMMIT_EDITMSGpb/commit-editmsg-pathPranit Bauva2016-06-091-7/+8
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'lf/receive-pack-auto-gc-to-client'Junio C Hamano2016-06-271-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: send auto-gc output over sideband 2lf/receive-pack-auto-gc-to-clientLukas Fleischer2016-06-061-2/+13
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \