summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* show-ref: remove a stale commentvp/show-ref-verify-headJunio C Hamano2017-01-231-4/+0
* show-ref: remove dead `if (verify)' checkVladimir Panteleev2017-01-231-3/+0
* show-ref: detect dangling refs under --verify as wellVladimir Panteleev2017-01-232-8/+30
* show-ref: move --quiet handling into show_one()Vladimir Panteleev2017-01-231-5/+4
* show-ref: allow -d to work with --verifyVladimir Panteleev2017-01-232-11/+21
* show-ref: accept HEAD with --verifyVladimir Panteleev2017-01-232-1/+12
* Sixth batch for 2.12Junio C Hamano2017-01-181-0/+64
* Merge branch 'sb/remove-gitview'Junio C Hamano2017-01-184-1369/+9
|\
| * doc: git-gui browser does not default to HEADsb/remove-gitviewPhilip Oakley2017-01-131-1/+1
| * doc: gitk: add the upstream repo locationPhilip Oakley2017-01-131-2/+8
| * doc: gitk: remove gitview referencePhilip Oakley2017-01-131-4/+0
| * contrib: remove gitviewStefan Beller2017-01-072-1362/+0
* | Merge branch 'js/asciidoctor-tweaks'Junio C Hamano2017-01-183-9/+18
|\ \
| * | asciidoctor: fix user-manual to be built by `asciidoctor`js/asciidoctor-tweaks마누엘2017-01-132-1/+9
| * | giteveryday: unbreak rendering with AsciiDoctorJohannes Schindelin2017-01-071-8/+9
* | | Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano2017-01-181-23/+30
|\ \ \
| * | | unpack-trees: factor progress setup out of check_updatessb/unpack-trees-cleanupStefan Beller2017-01-101-12/+20
| * | | unpack-trees: remove unneeded continueStefan Beller2017-01-101-1/+0
| * | | unpack-trees: move checkout state into check_updatesStefan Beller2017-01-101-12/+12
* | | | Merge branch 'rh/mergetool-regression-fix'Junio C Hamano2017-01-184-119/+186
|\ \ \ \
| * | | | mergetool: fix running in subdir when rerere enabledrh/mergetool-regression-fixRichard Hansen2017-01-102-3/+21
| * | | | mergetool: take the "-O" out of $orderfileRichard Hansen2017-01-101-2/+2
| * | | | t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-101-1/+20
| * | | | t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-101-18/+19
| * | | | t7610: don't assume the checked-out commitRichard Hansen2017-01-101-6/+6
| * | | | t7610: always work on a test-specific branchRichard Hansen2017-01-101-2/+8
| * | | | t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-101-2/+0
| * | | | t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-101-0/+8
| * | | | t7610: don't rely on state from previous testRichard Hansen2017-01-101-0/+6
| * | | | t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-101-34/+37
| * | | | t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-101-30/+35
| * | | | t7610: update branch names to match test numberRichard Hansen2017-01-101-41/+41
| * | | | rev-parse doc: pass "--" to rev-parse in the --prefix exampleRichard Hansen2017-01-101-1/+2
| * | | | .mailmap: record canonical email for Richard HansenRichard Hansen2017-01-101-0/+2
| | |/ / | |/| |
* | | | Merge branch 'bw/realpath-wo-chdir'Junio C Hamano2017-01-182-3/+7
|\ \ \ \
| * | | | real_path: set errno when max number of symlinks is exceededbw/realpath-wo-chdirBrandon Williams2017-01-091-0/+2
| * | | | real_path: prevent redefinition of MAXSYMLINKSBrandon Williams2017-01-091-1/+3
* | | | | Merge branch 'jk/execv-dashed-external'Junio C Hamano2017-01-183-21/+35
|\ \ \ \ \
| * | | | | execv_dashed_external: wait for child on signal deathJeff King2017-01-093-0/+21
| * | | | | execv_dashed_external: stop exiting with negative codeJeff King2017-01-091-3/+7
| * | | | | execv_dashed_external: use child_process structJeff King2017-01-091-18/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'sp/cygwin-build-fixes'Junio C Hamano2017-01-181-2/+2
|\ \ \ \ \
| * | | | | Makefile: put LIBS after LDFLAGS for imap-sendsp/cygwin-build-fixesSteven Penny2017-01-091-1/+1
| * | | | | Makefile: POSIX windresSteven Penny2017-01-091-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/pathspec-errors'Junio C Hamano2017-01-182-2/+69
|\ \ \ \ \
| * | | | | pathspec: give better message for submodule related pathspec errorsb/pathspec-errorsStefan Beller2017-01-092-2/+69
* | | | | | Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano2017-01-1810-26/+26
|\ \ \ \ \ \
| * | | | | | t9813: avoid using pipespb/test-must-fail-is-for-gitPranit Bauva2017-01-091-4/+4
| * | | | | | don't use test_must_fail with grepPranit Bauva2017-01-0710-22/+22
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'bw/pathspec-cleanup'Junio C Hamano2017-01-187-357/+388
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
View Lorry Controller Status