aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano2017-01-18
|\
| * unpack-trees: factor progress setup out of check_updatesStefan Beller2017-01-10
| * unpack-trees: remove unneeded continueStefan Beller2017-01-10
| * unpack-trees: move checkout state into check_updatesStefan Beller2017-01-10
* | Merge branch 'rh/mergetool-regression-fix'Junio C Hamano2017-01-18
|\ \
| * | mergetool: fix running in subdir when rerere enabledRichard Hansen2017-01-10
| * | mergetool: take the "-O" out of $orderfileRichard Hansen2017-01-10
| * | t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-10
| * | t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-10
| * | t7610: don't assume the checked-out commitRichard Hansen2017-01-10
| * | t7610: always work on a test-specific branchRichard Hansen2017-01-10
| * | t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-10
| * | t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-10
| * | t7610: don't rely on state from previous testRichard Hansen2017-01-10
| * | t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-10
| * | t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-10
| * | t7610: update branch names to match test numberRichard Hansen2017-01-10
| * | rev-parse doc: pass "--" to rev-parse in the --prefix exampleRichard Hansen2017-01-10
| * | .mailmap: record canonical email for Richard HansenRichard Hansen2017-01-10
* | | Merge branch 'bw/realpath-wo-chdir'Junio C Hamano2017-01-18
|\ \ \
| * | | real_path: set errno when max number of symlinks is exceededBrandon Williams2017-01-09
| * | | real_path: prevent redefinition of MAXSYMLINKSBrandon Williams2017-01-09
* | | | Merge branch 'jk/execv-dashed-external'Junio C Hamano2017-01-18
|\ \ \ \
| * | | | execv_dashed_external: wait for child on signal deathJeff King2017-01-09
| * | | | execv_dashed_external: stop exiting with negative codeJeff King2017-01-09
| * | | | execv_dashed_external: use child_process structJeff King2017-01-09
| | |_|/ | |/| |
* | | | Merge branch 'sp/cygwin-build-fixes'Junio C Hamano2017-01-18
|\ \ \ \
| * | | | Makefile: put LIBS after LDFLAGS for imap-sendSteven Penny2017-01-09
| * | | | Makefile: POSIX windresSteven Penny2017-01-09
| | |_|/ | |/| |
* | | | Merge branch 'sb/pathspec-errors'Junio C Hamano2017-01-18
|\ \ \ \
| * | | | pathspec: give better message for submodule related pathspec errorStefan Beller2017-01-09
* | | | | Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano2017-01-18
|\ \ \ \ \
| * | | | | t9813: avoid using pipesPranit Bauva2017-01-09
| * | | | | don't use test_must_fail with grepPranit Bauva2017-01-07
| | |_|/ / | |/| | |
* | | | | Merge branch 'bw/pathspec-cleanup'Junio C Hamano2017-01-18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | pathspec: rename prefix_pathspec to init_pathspec_itemBrandon Williams2017-01-08
| * | | | pathspec: small readability changesBrandon Williams2017-01-08
| * | | | pathspec: create strip submodule slash helpersBrandon Williams2017-01-08
| * | | | pathspec: create parse_element_magic helperBrandon Williams2017-01-08
| * | | | pathspec: create parse_long_magic functionBrandon Williams2017-01-08
| * | | | pathspec: create parse_short_magic functionBrandon Williams2017-01-08
| * | | | pathspec: factor global magic into its own functionBrandon Williams2017-01-08
| * | | | pathspec: simpler logic to prefix original pathspec elementsBrandon Williams2017-01-08
| * | | | pathspec: always show mnemonic and name in unsupported_magicBrandon Williams2017-01-08
| * | | | pathspec: remove unused variable from unsupported_magicBrandon Williams2017-01-08
| * | | | pathspec: copy and free owned memoryBrandon Williams2017-01-08
| * | | | pathspec: remove the deprecated get_pathspec functionBrandon Williams2017-01-08
| * | | | ls-tree: convert show_recursive to use the pathspec struct interfaceBrandon Williams2017-01-08
| * | | | dir: convert fill_directory to use the pathspec struct interfaceBrandon Williams2017-01-08
| * | | | dir: remove struct path_simplifyBrandon Williams2017-01-08