summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | wt-status: correct and simplify check for detached HEADrs/status-detached-head-memcmpRené Scharfe2015-11-281-5/+4
| * | | | | | | | | Merge branch 'ad/sha1-update-chunked' into maintJunio C Hamano2015-12-087-13/+69
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-082-7/+31
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/interpret-trailers-outside-a-repository' into maintJunio C Hamano2015-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano2015-12-083-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-12-041-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Prepare for 2.6.4Junio C Hamano2015-12-042-1/+49
| * | | | | | | | | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2015-12-042-3/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-046-22/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | RelNotes update for 2.7Junio C Hamano2015-12-041-0/+51
* | | | | | | | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan'Junio C Hamano2015-12-042-7/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphanSZEDER Gábor2015-11-242-5/+4
| * | | | | | | | | | | | | | bash prompt: remove a redundant 'git diff' optionSZEDER Gábor2015-11-241-1/+1
| * | | | | | | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-241-3/+28
* | | | | | | | | | | | | | | Merge branch 'np/credential-cache-sighup'Junio C Hamano2015-12-042-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | credential-cache: new option to ignore sighupnp/credential-cache-sighupNoam Postavsky2015-11-202-0/+10
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'rs/parseopt-short-help'Junio C Hamano2015-12-044-48/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-helpRené Scharfe2015-11-201-11/+1
| * | | | | | | | | | | | | | | grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-201-16/+1
| * | | | | | | | | | | | | | | parse-options: allow -h as a short optionRené Scharfe2015-11-202-6/+11
| * | | | | | | | | | | | | | | parse-options: inline parse_options_usage() at its only remaining callerRené Scharfe2015-11-201-12/+1
| * | | | | | | | | | | | | | | parse-options: deduplicate parse_options_usage() callsRené Scharfe2015-11-201-6/+12
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-044-0/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | completion: add support for completing email aliasesJacob Keller2015-11-201-0/+16
| * | | | | | | | | | | | | | | sendemail: teach git-send-email to dump alias namesJacob Keller2015-11-203-0/+108
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-no-index'Junio C Hamano2015-12-042-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | filter-branch: skip index read/write when possibleJeff King2015-11-062-2/+40
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ad/sha1-update-chunked'Junio C Hamano2015-12-047-13/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | sha1: allow limiting the size of the data passed to SHA1_Update()ad/sha1-update-chunkedAtousa Pahlevan Duprat2015-11-055-0/+44
| * | | | | | | | | | | | | | sha1: provide another level of indirection for the SHA-1 functionsAtousa Pahlevan Duprat2015-11-053-13/+25
* | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent'Jeff King2015-12-012-16/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | blame: fix object casting regressionJeff King2015-11-242-16/+21
* | | | | | | | | | | | | | | | Merge branch 'jk/send-email-ca-path'Jeff King2015-12-011-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | send-email: die if CA path doesn't existJohn Keeping2015-11-241-2/+1
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/fsck-nul-header'Jeff King2015-12-012-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fsck: treat a NUL in a tag header as an errorRené Scharfe2015-11-202-2/+3
| * | | | | | | | | | | | | | | | t1450: add tests for NUL in headers of commits and tagsRené Scharfe2015-11-201-0/+32
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ls/p4-test-timeouts'Jeff King2015-12-011-9/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | git-p4: add trap to kill p4d on test exitLars Schneider2015-11-201-0/+9
| * | | | | | | | | | | | | | | | git-p4: add p4d timeout in testsLars Schneider2015-11-201-1/+19
| * | | | | | | | | | | | | | | | git-p4: retry kill/cleanup operations in tests with timeoutLars Schneider2015-11-201-8/+34
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'js/test-modernize-t9300'Jeff King2015-12-011-1783/+1798
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | modernize t9300: move test preparations into test_expect_successJohannes Sixt2015-11-201-1250/+1264
| * | | | | | | | | | | | | | | | modernize t9300: mark here-doc words to ignore tab indentationJohannes Sixt2015-11-201-100/+100
| * | | | | | | | | | | | | | | | modernize t9300: use test_when_finished for clean-upJohannes Sixt2015-11-201-20/+16
| * | | | | | | | | | | | | | | | modernize t9300: wrap lines after &&Johannes Sixt2015-11-201-16/+32
| * | | | | | | | | | | | | | | | modernize t9300: use test_must_be_emptyJohannes Sixt2015-11-201-5/+3
| * | | | | | | | | | | | | | | | modernize t9300: use test_must_failJohannes Sixt2015-11-201-14/+3
| * | | | | | | | | | | | | | | | modernize t9300: single-quote placement and indentationJohannes Sixt2015-11-201-435/+437
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jk/send-email-expand-paths'Jeff King2015-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \