aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'tb/complete-status'Junio C Hamano2016-06-27
|\
| * completion: add git statusThomas Braun2016-06-10
| * completion: add __git_get_option_value helperThomas Braun2016-06-10
| * completion: factor out untracked file modes into a variableThomas Braun2016-06-10
* | Merge branch 'mg/cherry-pick-multi-on-unborn'Junio C Hamano2016-06-27
|\ \
| * | cherry-pick: allow to pick to unborn branchesMichael J Gruber2016-06-06
* | | Merge branch 'lf/receive-pack-auto-gc-to-client'Junio C Hamano2016-06-27
|\ \ \
| * | | receive-pack: send auto-gc output over sideband 2Lukas Fleischer2016-06-06
* | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano2016-06-27
|\ \ \ \
| * | | | rebase: update comment about FreeBSD /bin/shEd Maste2016-06-17
| | |/ / | |/| |
* | | | Merge branch 'lv/status-say-working-tree-not-directory'Junio C Hamano2016-06-27
|\ \ \ \
| * | | | Use "working tree" instead of "working directory" for git statusLars Vogel2016-06-09
* | | | | Merge branch 'nb/gnome-keyring-build'Junio C Hamano2016-06-27
|\ \ \ \ \
| * | | | | gnome-keyring: Don't hard-code pkg-config executableHeiko Becker2016-06-14
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/deref-tag'Junio C Hamano2016-06-27
|\ \ \ \ \
| * | | | | blame, line-log: do not loop around deref_tag()Junio C Hamano2016-06-14
| |/ / / /
* | | | | Merge branch 'et/add-chmod-x'Junio C Hamano2016-06-27
|\ \ \ \ \
| * | | | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-07
* | | | | | Merge branch 'jk/avoid-unbounded-alloca'Junio C Hamano2016-06-27
|\ \ \ \ \ \
| * | | | | | tree-diff: avoid alloca for large allocationsJeff King2016-06-07
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rj/compat-regex-size-max-fix'Junio C Hamano2016-06-27
|\ \ \ \ \ \
| * | | | | | regex: fix a SIZE_MAX macro redefinition warningRamsay Jones2016-06-06
* | | | | | | Merge branch 'vs/prompt-avoid-unset-variable'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \
| * | | | | | | git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shaVille Skyttä2016-06-06
* | | | | | | | Merge branch 'sg/reflog-past-root'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \
| * | | | | | | | reflog: continue walking the reflog past root commitsSZEDER Gábor2016-06-06
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'pb/strbuf-read-file-doc'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf: describe the return value of strbuf_read_filePranit Bauva2016-06-14
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'dn/gpg-doc'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: GPG capitalizationDave Nicolson2016-06-16
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/fetch-prune-doc'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: document that pruning happens before fetchingJeff King2016-06-14
| |/ / / / / / /
* | | | | | | | Merge branch 'ap/git-svn-propset-doc'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \
| * | | | | | | | git-svn: document the 'git svn propset' commandAlfred Perlstein2016-06-15
* | | | | | | | | Merge branch 'tr/doc-tt'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: change configuration variables formatTom Russello2016-06-08
| * | | | | | | | | doc: more consistency in environment variables formatTom Russello2016-06-08
| * | | | | | | | | doc: change environment variables formatTom Russello2016-06-08
| * | | | | | | | | doc: clearer rule about formatting literalsTom Russello2016-06-08
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pc/occurred'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config.c: fix misspelt "occurred" in an error messagePeter Colberg2016-06-10
| * | | | | | | | | refs.h: fix misspelt "occurred" in a commentPeter Colberg2016-06-10
| |/ / / / / / / /
* | | | | | | | | Merge branch 'cc/apply-introduce-state'Junio C Hamano2016-06-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/apply: remove misleading comment on lock_file fieldJunio C Hamano2016-06-06
| * | | | | | | | | builtin/apply: move 'newfd' global into 'struct apply_state'Christian Couder2016-06-03
| * | | | | | | | | builtin/apply: add 'lock_file' pointer into 'struct apply_state'Christian Couder2016-06-03
| * | | | | | | | | builtin/apply: move applying patches into apply_all_patches()Christian Couder2016-06-01
| * | | | | | | | | builtin/apply: move 'state' check into check_apply_state()Christian Couder2016-06-01
| * | | | | | | | | builtin/apply: move 'symlink_changes' global into 'struct apply_state'Christian Couder2016-06-01
| * | | | | | | | | builtin/apply: move 'fn_table' global into 'struct apply_state'Christian Couder2016-06-01