summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-02-03Merge branch 'jk/notes-merge-from-anywhere'Libravatar Junio C Hamano4-12/+29
2016-02-03Merge branch 'jc/peace-with-crlf'Libravatar Junio C Hamano13-20/+15
2016-02-01Getting closer to 2.7.1Libravatar Junio C Hamano1-0/+9
2016-02-01Merge branch 'jk/list-tag-2.7-regression'Libravatar Junio C Hamano7-56/+72
2016-02-01Merge branch 'ew/svn-1.9.0-auth'Libravatar Junio C Hamano1-2/+6
2016-01-28Fourth batch for 2.8.cycleLibravatar Junio C Hamano1-1/+24
2016-01-28Merge branch 'jk/shortlog'Libravatar Junio C Hamano2-103/+105
2016-01-28Merge branch 'jc/strbuf-getline'Libravatar Junio C Hamano41-116/+150
2016-01-28Merge branch 'js/msys2'Libravatar Junio C Hamano7-12/+77
2016-01-28Merge branch 'tk/interpret-trailers-in-place'Libravatar Junio C Hamano5-20/+129
2016-01-28Merge branch 'jk/sanity'Libravatar Junio C Hamano1-5/+13
2016-01-28Merge branch 'jk/filter-branch-no-index'Libravatar Junio C Hamano2-1/+9
2016-01-27t7063: add tests for core.untrackedCacheLibravatar Christian Couder1-4/+81
2016-01-27test-dump-untracked-cache: don't modify the untracked cacheLibravatar Christian Couder4-0/+22
2016-01-27config: add core.untrackedCacheLibravatar Christian Couder8-31/+133
2016-01-27merge-file: ensure that conflict sections match eol styleLibravatar Johannes Schindelin2-15/+25
2016-01-27merge-file: let conflict markers match end-of-line style of the contextLibravatar Johannes Schindelin2-4/+69
2016-01-26git-svn: fix auth parameter handling on SVN 1.9.0+Libravatar Eric Wong1-2/+6
2016-01-26Third batch for 2.8 cycleLibravatar Junio C Hamano1-0/+24
2016-01-26Merge branch 'jk/symbolic-ref'Libravatar Junio C Hamano6-77/+140
2016-01-26Merge branch 'ak/format-patch-odir-config'Libravatar Junio C Hamano4-1/+30
2016-01-26Merge branch 'rp/p4-filetype-change'Libravatar Junio C Hamano2-2/+73
2016-01-26Merge branch 'js/close-packs-before-gc'Libravatar Junio C Hamano5-0/+18
2016-01-26Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'Libravatar Junio C Hamano1-1/+1
2016-01-26Merge branch 'js/pull-rebase-i'Libravatar Junio C Hamano6-7/+32
2016-01-26tag: do not show ambiguous tag names as "tags/foo"Libravatar Jeff King7-4/+62
2016-01-26http: use credential API to handle proxy authenticationLibravatar Knut Franke3-3/+85
2016-01-26http: allow selection of proxy authentication methodLibravatar Knut Franke5-3/+96
2016-01-26travis-ci: explicity use container-based infrastructureLibravatar Lars Schneider1-0/+2
2016-01-26travis-ci: run previously failed tests first, then slowest to fastestLibravatar Lars Schneider1-1/+7
2016-01-26completion: update completion arguments for stashLibravatar Paul Wagland1-3/+14
2016-01-25completion: complete show-branch "--date-order"Libravatar Paul Wagland1-1/+1
2016-01-25completion: add missing git-rebase optionsLibravatar John Keeping1-2/+6
2016-01-25mingw: avoid linking to the C library's isalpha()Libravatar Johannes Sixt2-6/+8
2016-01-25dir: simplify untracked cache "ident" fieldLibravatar Christian Couder2-16/+24
2016-01-25dir: add remove_untracked_cache()Libravatar Christian Couder3-5/+11
2016-01-25dir: add {new,add}_untracked_cache()Libravatar Christian Couder3-10/+20
2016-01-25update-index: move 'uc' var declarationLibravatar Christian Couder1-3/+1
2016-01-25update-index: add untracked cache notificationsLibravatar Christian Couder1-5/+9
2016-01-25update-index: add --test-untracked-cacheLibravatar Christian Couder2-1/+16
2016-01-25update-index: use enum for untracked cache optionsLibravatar Christian Couder1-5/+13
2016-01-25t6300: use test_atom for some un-modern testsLibravatar Jeff King1-52/+10
2016-01-25resolve_gitlink_ref: ignore non-repository pathsLibravatar Jeff King3-14/+43
2016-01-25clean: make is_git_repository a public functionLibravatar Jeff King3-26/+37
2016-01-22worktree: stop supporting moving worktrees manuallyLibravatar Nguyễn Thái Ngọc Duy2-17/+10
2016-01-22Merge branch 'ep/shell-command-substitution-style'Libravatar Junio C Hamano91-400/+400
2016-01-22Merge branch 'rm/subtree-unwrap-tags'Libravatar Junio C Hamano1-2/+8
2016-01-22unpack-trees: fix accidentally quadratic behaviorLibravatar David Turner1-1/+12
2016-01-21diff: make -O and --output work in subdirectoryLibravatar Duy Nguyen6-8/+21
2016-01-21diff-no-index: do not take a redundant prefix argumentLibravatar Nguyễn Thái Ngọc Duy3-4/+4