summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | t0060: loosen overly strict expectationsJohannes Schindelin2016-01-151-57/+21
| * | | | | | | | | | t0060: verify that basename() and dirname() work as expectedJohannes Schindelin2016-01-122-0/+169
| * | | | | | | | | | compat/basename.c: provide a dirname() compatibility functionJohannes Schindelin2016-01-122-0/+46
| * | | | | | | | | | compat/basename: make basename() conform to POSIXJohannes Schindelin2016-01-121-3/+17
| * | | | | | | | | | Refactor skipping DOS drive prefixesJohannes Schindelin2016-01-125-22/+28
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tb/complete-word-diff-regex' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: complete "diff --word-diff-regex="tb/complete-word-diff-regexThomas Braun2016-01-201-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pw/completion-stash' into maintJunio C Hamano2016-02-051-3/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | completion: update completion arguments for stashPaul Wagland2016-01-261-3/+14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pw/completion-show-branch' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: complete show-branch "--date-order"pw/completion-show-branchPaul Wagland2016-01-251-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/completion-rebase' into maintJunio C Hamano2016-02-051-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | completion: add missing git-rebase optionsjk/completion-rebaseJohn Keeping2016-01-251-2/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-057-12/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-216-8/+21
| * | | | | | | | | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-213-4/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dw/subtree-split-do-not-drop-merge' into maintJunio C Hamano2016-02-052-2/+70
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-mergeDave Ware2016-01-202-2/+70
* | | | | | | | | | Merge branch 'ew/svn-1.9.0-auth' into maintJunio C Hamano2016-02-051-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: fix auth parameter handling on SVN 1.9.0+ew/svn-1.9.0-authEric Wong2016-01-261-2/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-057-56/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tag: do not show ambiguous tag names as "tags/foo"jk/list-tag-2.7-regressionJeff King2016-01-267-4/+62
| * | | | | | | | | | t6300: use test_atom for some un-modern testsJeff King2016-01-251-52/+10
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/sanity' into maintJunio C Hamano2016-02-051-5/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-lib: clarify and tighten SANITYjk/sanityJunio C Hamano2016-01-191-5/+13
* | | | | | | | | | | Merge branch 'jk/filter-branch-no-index' into maintJunio C Hamano2016-02-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | filter-branch: resolve $commit^{tree} in no-index casejk/filter-branch-no-indexJeff King2016-01-192-1/+9
* | | | | | | | | | | | Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-055-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | | | | | | | | | | merge: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | | | | | | | | | | am: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | | | | | | | | | | fetch: release pack files before garbage-collectingJohannes Schindelin2016-01-132-0/+15
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase: ignore failures from "gc --auto"jk/ok-to-fail-gc-auto-in-rebaseJeff King2016-01-131-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ho/gitweb-squelch-undef-warning' into maintJunio C Hamano2016-02-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: squelch "uninitialized value" warningho/gitweb-squelch-undef-warningØyvind A. Holm2016-01-121-1/+1
* | | | | | | | | | | | | Merge branch 'js/fopen-harder' into maintJunio C Hamano2016-02-055-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Handle more file writes correctly in shared reposjs/fopen-harderJohannes Schindelin2016-01-112-2/+2
| * | | | | | | | | | | | | commit: allow editing the commit message even in shared reposJohannes Schindelin2016-01-073-1/+15
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/exclusion-regression-fix' into maintJunio C Hamano2016-02-053-118/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"Nguyễn Thái Ngọc Duy2016-01-083-117/+5
* | | | | | | | | | | | | | Merge branch 'dk/reflog-walk-with-non-commit' into maintJunio C Hamano2016-02-052-5/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | reflog-walk: don't segfault on non-commit sha1's in the reflogdk/reflog-walk-with-non-commitDennis Kaarsemaker2016-01-052-5/+24
* | | | | | | | | | | | | | | Merge branch 'dw/signoff-doc' into maintJunio C Hamano2016-02-055-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Expand documentation describing --signoffdw/signoff-docDavid A. Wheeler2016-01-055-1/+9
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/clang-pedantic' into maintJunio C Hamano2016-02-054-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | bswap: add NO_UNALIGNED_LOADS definejk/clang-pedanticJeff King2016-01-041-2/+3
| * | | | | | | | | | | | | | | avoid shifting signed integers 31 bitsJeff King2016-01-043-3/+3
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ew/send-email-mutt-alias-fix' into maintJunio C Hamano2016-02-052-2/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-send-email: do not double-escape quotes from muttew/send-email-mutt-alias-fixEric Wong2016-01-042-2/+22
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |