summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-01-17Merge branch 'sb/sequencer-abort-safety' into maintLibravatar Junio C Hamano3-2/+61
2017-01-17Merge branch 'da/mergetool-xxdiff-hotkey' into maintLibravatar Junio C Hamano1-5/+5
2017-01-17Merge branch 'jc/pull-rebase-ff' into maintLibravatar Junio C Hamano2-4/+35
2017-01-17Merge branch 'js/normalize-path-copy-ceil' into maintLibravatar Junio C Hamano1-9/+14
2017-01-17Merge branch 'ak/commit-only-allow-empty' into maintLibravatar Junio C Hamano3-4/+12
2017-01-17Merge branch 'da/difftool-dir-diff-fix' into maintLibravatar Junio C Hamano2-3/+45
2017-01-17Merge branch 'jb/diff-no-index-no-abbrev' into maintLibravatar Junio C Hamano8-1/+39
2017-01-17Merge branch 'jk/stash-disable-renames-internally' into maintLibravatar Junio C Hamano2-1/+10
2017-01-17Merge branch 'jk/http-walker-limit-redirect' into maintLibravatar Junio C Hamano9-28/+165
2017-01-17Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintLibravatar Junio C Hamano3-6/+21
2017-01-17Merge branch 'ls/p4-empty-file-on-lfs' into maintLibravatar Junio C Hamano2-12/+19
2017-01-17Merge branch 'da/mergetool-trust-exit-code' into maintLibravatar Junio C Hamano20-38/+75
2017-01-17Merge branch 'nd/worktree-list-fixup' into maintLibravatar Junio C Hamano6-30/+74
2017-01-17Merge branch 'bw/push-dry-run' into maintLibravatar Junio C Hamano4-9/+41
2017-01-17Merge branch 'hv/submodule-not-yet-pushed-fix' into maintLibravatar Junio C Hamano3-36/+121
2017-01-17Merge branch 'dt/empty-submodule-in-merge' into maintLibravatar Junio C Hamano3-11/+17
2017-01-17Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintLibravatar Junio C Hamano2-1/+24
2017-01-17Merge branch 'js/mingw-isatty' into maintLibravatar Junio C Hamano2-86/+92
2017-01-17Merge branch 'bb/unicode-9.0' into maintLibravatar Junio C Hamano6-65/+163
2017-01-17Merge branch 'ls/travis-update-p4-and-lfs' into maintLibravatar Junio C Hamano1-2/+2
2017-01-13doc: git-gui browser does not default to HEADLibravatar Philip Oakley1-1/+1
2017-01-13doc: gitk: add the upstream repo locationLibravatar Philip Oakley1-2/+8
2017-01-13doc: gitk: remove gitview referenceLibravatar Philip Oakley1-4/+0
2017-01-13asciidoctor: fix user-manual to be built by `asciidoctor`Libravatar 마누엘2-1/+9
2017-01-11index: improve constness for reading blob dataLibravatar Brandon Williams2-2/+3
2017-01-10Fifth batch 2.12Libravatar Junio C Hamano1-0/+45
2017-01-10Merge branch 'sb/submodule-embed-gitdir'Libravatar Junio C Hamano12-43/+399
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Libravatar Junio C Hamano7-67/+8
2017-01-10Merge branch 'nd/config-misc-fixes'Libravatar Junio C Hamano1-5/+15
2017-01-10Merge branch 'jc/abbrev-autoscale-config'Libravatar Junio C Hamano2-8/+15
2017-01-10Merge branch 'mh/fast-import-notes-fix-new'Libravatar Junio C Hamano2-3/+47
2017-01-10Merge branch 'jc/git-open-cloexec'Libravatar Junio C Hamano3-36/+22
2017-01-10Merge branch 'jc/compression-config'Libravatar Junio C Hamano9-31/+158
2017-01-10Merge branch 'dt/smart-http-detect-server-going-away'Libravatar Junio C Hamano5-4/+77
2017-01-10Merge branch 'mm/gc-safety-doc'Libravatar Junio C Hamano2-9/+29
2017-01-10Merge branch 'mm/push-social-engineering-attack-doc'Libravatar Junio C Hamano6-22/+51
2017-01-10Merge branch 'jt/fetch-no-redundant-tag-fetch-map'Libravatar Junio C Hamano1-3/+0
2017-01-10Merge branch 'jc/latin-1'Libravatar Junio C Hamano1-11/+25
2017-01-10mergetool: fix running in subdir when rerere enabledLibravatar Richard Hansen2-3/+21
2017-01-10mergetool: take the "-O" out of $orderfileLibravatar Richard Hansen1-2/+2
2017-01-10t7610: add test case for rerere+mergetool+subdir bugLibravatar Richard Hansen1-1/+20
2017-01-10t7610: spell 'git reset --hard' consistentlyLibravatar Richard Hansen1-18/+19
2017-01-10t7610: don't assume the checked-out commitLibravatar Richard Hansen1-6/+6
2017-01-10t7610: always work on a test-specific branchLibravatar Richard Hansen1-2/+8
2017-01-10t7610: delete some now-unnecessary 'git reset --hard' linesLibravatar Richard Hansen1-2/+0
2017-01-10t7610: run 'git reset --hard' after each test to clean upLibravatar Richard Hansen1-0/+8
2017-01-10t7610: don't rely on state from previous testLibravatar Richard Hansen1-0/+6
2017-01-10t7610: use test_when_finished for cleanup tasksLibravatar Richard Hansen1-34/+37
2017-01-10t7610: move setup code to the 'setup' test caseLibravatar Richard Hansen1-30/+35
2017-01-10t7610: update branch names to match test numberLibravatar Richard Hansen1-41/+41