summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* common-main: call git_setup_gettext()js/common-mainJeff King2016-07-0112-22/+2
* common-main: call restore_sigpipe_to_default()Jeff King2016-07-012-23/+23
* common-main: call sanitize_stdfds()Jeff King2016-07-014-17/+9
* common-main: call git_extract_argv0_path()Jeff King2016-07-0112-19/+4
* fixup! add an extra level of indirection to main()Johannes Schindelin2016-07-011-7/+1
* add an extra level of indirection to main()Jeff King2016-07-0152-67/+89
* mingw: Declare main()'s argv as constJohannes Schindelin2016-07-011-1/+1
* mingw: let the build succeed with DEVELOPER=1Johannes Schindelin2016-07-013-6/+6
* Second batch of topics for 2.10Junio C Hamano2016-06-271-0/+65
* Sync with maintJunio C Hamano2016-06-271-0/+28
|\
| * Start preparing for 2.9.1Junio C Hamano2016-06-272-1/+29
| * Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-2710-93/+365
| |\
| * \ Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-272-1/+11
| |\ \
| * \ \ Merge branch 'et/pretty-format-c-auto' into maintJunio C Hamano2016-06-272-8/+20
| |\ \ \
| * \ \ \ Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-06-271-0/+14
| |\ \ \ \
* | \ \ \ \ Merge branch 'tb/complete-status'Junio C Hamano2016-06-271-1/+97
|\ \ \ \ \ \
| * | | | | | completion: add git statustb/complete-statusThomas Braun2016-06-101-0/+50
| * | | | | | completion: add __git_get_option_value helperThomas Braun2016-06-101-0/+44
| * | | | | | completion: factor out untracked file modes into a variableThomas Braun2016-06-101-1/+3
* | | | | | | Merge branch 'mg/cherry-pick-multi-on-unborn'Junio C Hamano2016-06-271-5/+6
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick: allow to pick to unborn branchesmg/cherry-pick-multi-on-unbornMichael J Gruber2016-06-061-5/+6
* | | | | | | | 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 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano2016-06-273-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returnsEd Maste2016-06-173-6/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'lv/status-say-working-tree-not-directory'Junio C Hamano2016-06-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directoryLars Vogel2016-06-091-1/+1
* | | | | | | | | | Merge branch 'nb/gnome-keyring-build'Junio C Hamano2016-06-271-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gnome-keyring: Don't hard-code pkg-config executablenb/gnome-keyring-buildHeiko Becker2016-06-141-2/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/deref-tag'Junio C Hamano2016-06-272-6/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tagJunio C Hamano2016-06-142-6/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'et/add-chmod-x'Junio C Hamano2016-06-276-20/+68
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-076-20/+68
* | | | | | | | | | | Merge branch 'jk/avoid-unbounded-alloca'Junio C Hamano2016-06-271-6/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tree-diff: avoid alloca for large allocationsjk/avoid-unbounded-allocaJeff King2016-06-071-6/+16
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rj/compat-regex-size-max-fix'Junio C Hamano2016-06-272-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | regex: fix a SIZE_MAX macro redefinition warningrj/compat-regex-size-max-fixRamsay Jones2016-06-062-2/+1
* | | | | | | | | | | | Merge branch 'vs/prompt-avoid-unset-variable'Junio C Hamano2016-06-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shavs/prompt-avoid-unset-variableVille Skyttä2016-06-061-3/+3
* | | | | | | | | | | | | Merge branch 'sg/reflog-past-root'Junio C Hamano2016-06-273-1/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reflog: continue walking the reflog past root commitsSZEDER Gábor2016-06-063-1/+29
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'pb/strbuf-read-file-doc'Junio C Hamano2016-06-271-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | strbuf: describe the return value of strbuf_read_filepb/strbuf-read-file-docPranit Bauva2016-06-141-0/+2
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dn/gpg-doc'Junio C Hamano2016-06-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation: GPG capitalizationdn/gpg-docDave Nicolson2016-06-162-2/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/fetch-prune-doc'Junio C Hamano2016-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fetch: document that pruning happens before fetchingjk/fetch-prune-docJeff King2016-06-141-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ap/git-svn-propset-doc'Junio C Hamano2016-06-271-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-svn: document the 'git svn propset' commandap/git-svn-propset-docAlfred Perlstein2016-06-151-0/+14
* | | | | | | | | | | | | | Merge branch 'tr/doc-tt'Junio C Hamano2016-06-2736-217/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ \