Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-p4: place temporary refs used for branch import under refs/git-p4-tmpls/p4-tmp-refs | Lars Schneider | 2016-07-08 | 2 | -3/+3 |
* | Second batch of topics for 2.10 | Junio C Hamano | 2016-06-27 | 1 | -0/+65 |
* | Sync with maint | Junio C Hamano | 2016-06-27 | 1 | -0/+28 |
|\ | |||||
| * | Start preparing for 2.9.1 | Junio C Hamano | 2016-06-27 | 2 | -1/+29 |
| * | Merge branch 'rs/xdiff-hunk-with-func-line' into maint | Junio C Hamano | 2016-06-27 | 10 | -93/+365 |
| |\ | |||||
| * \ | Merge branch 'jk/rev-list-count-with-bitmap' into maint | Junio C Hamano | 2016-06-27 | 2 | -1/+11 |
| |\ \ | |||||
| * \ \ | Merge branch 'et/pretty-format-c-auto' into maint | Junio C Hamano | 2016-06-27 | 2 | -8/+20 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ew/daemon-socket-keepalive' into maint | Junio C Hamano | 2016-06-27 | 1 | -0/+14 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'tb/complete-status' | Junio C Hamano | 2016-06-27 | 1 | -1/+97 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: add git statustb/complete-status | Thomas Braun | 2016-06-10 | 1 | -0/+50 |
| * | | | | | | completion: add __git_get_option_value helper | Thomas Braun | 2016-06-10 | 1 | -0/+44 |
| * | | | | | | completion: factor out untracked file modes into a variable | Thomas Braun | 2016-06-10 | 1 | -1/+3 |
* | | | | | | | Merge branch 'mg/cherry-pick-multi-on-unborn' | Junio C Hamano | 2016-06-27 | 1 | -5/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cherry-pick: allow to pick to unborn branchesmg/cherry-pick-multi-on-unborn | Michael J Gruber | 2016-06-06 | 1 | -5/+6 |
* | | | | | | | | Merge branch 'lf/receive-pack-auto-gc-to-client' | Junio C Hamano | 2016-06-27 | 1 | -2/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | receive-pack: send auto-gc output over sideband 2lf/receive-pack-auto-gc-to-client | Lukas Fleischer | 2016-06-06 | 1 | -2/+13 |
* | | | | | | | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' | Junio C Hamano | 2016-06-27 | 3 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returns | Ed Maste | 2016-06-17 | 3 | -6/+6 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'lv/status-say-working-tree-not-directory' | Junio C Hamano | 2016-06-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directory | Lars Vogel | 2016-06-09 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'nb/gnome-keyring-build' | Junio C Hamano | 2016-06-27 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | gnome-keyring: Don't hard-code pkg-config executablenb/gnome-keyring-build | Heiko Becker | 2016-06-14 | 1 | -2/+3 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/deref-tag' | Junio C Hamano | 2016-06-27 | 2 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tag | Junio C Hamano | 2016-06-14 | 2 | -6/+3 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'et/add-chmod-x' | Junio C Hamano | 2016-06-27 | 6 | -20/+68 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add: add --chmod=+x / --chmod=-x options | Edward Thomson | 2016-06-07 | 6 | -20/+68 |
* | | | | | | | | | | | Merge branch 'jk/avoid-unbounded-alloca' | Junio C Hamano | 2016-06-27 | 1 | -6/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | tree-diff: avoid alloca for large allocationsjk/avoid-unbounded-alloca | Jeff King | 2016-06-07 | 1 | -6/+16 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rj/compat-regex-size-max-fix' | Junio C Hamano | 2016-06-27 | 2 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | regex: fix a SIZE_MAX macro redefinition warningrj/compat-regex-size-max-fix | Ramsay Jones | 2016-06-06 | 2 | -2/+1 |
* | | | | | | | | | | | | Merge branch 'vs/prompt-avoid-unset-variable' | Junio C Hamano | 2016-06-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shavs/prompt-avoid-unset-variable | Ville Skyttä | 2016-06-06 | 1 | -3/+3 |
* | | | | | | | | | | | | | Merge branch 'sg/reflog-past-root' | Junio C Hamano | 2016-06-27 | 3 | -1/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | reflog: continue walking the reflog past root commits | SZEDER Gábor | 2016-06-06 | 3 | -1/+29 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'pb/strbuf-read-file-doc' | Junio C Hamano | 2016-06-27 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | strbuf: describe the return value of strbuf_read_filepb/strbuf-read-file-doc | Pranit Bauva | 2016-06-14 | 1 | -0/+2 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'dn/gpg-doc' | Junio C Hamano | 2016-06-27 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Documentation: GPG capitalizationdn/gpg-doc | Dave Nicolson | 2016-06-16 | 2 | -2/+2 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'jk/fetch-prune-doc' | Junio C Hamano | 2016-06-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fetch: document that pruning happens before fetchingjk/fetch-prune-doc | Jeff King | 2016-06-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'ap/git-svn-propset-doc' | Junio C Hamano | 2016-06-27 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-svn: document the 'git svn propset' commandap/git-svn-propset-doc | Alfred Perlstein | 2016-06-15 | 1 | -0/+14 |
* | | | | | | | | | | | | | | Merge branch 'tr/doc-tt' | Junio C Hamano | 2016-06-27 | 36 | -217/+224 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | doc: change configuration variables formattr/doc-tt | Tom Russello | 2016-06-08 | 17 | -86/+86 |
| * | | | | | | | | | | | | | | doc: more consistency in environment variables format | Tom Russello | 2016-06-08 | 17 | -27/+27 |
| * | | | | | | | | | | | | | | doc: change environment variables format | Tom Russello | 2016-06-08 | 9 | -101/+101 |
| * | | | | | | | | | | | | | | doc: clearer rule about formatting literals | Tom Russello | 2016-06-08 | 1 | -3/+10 |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'pc/occurred' | Junio C Hamano | 2016-06-27 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | config.c: fix misspelt "occurred" in an error messagepc/occurred | Peter Colberg | 2016-06-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | refs.h: fix misspelt "occurred" in a comment | Peter Colberg | 2016-06-10 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / |