Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Add new @ shortcut for HEAD" | Junio C Hamano | 2013-08-14 | 1 | -2/+0 |
* | Revert "git stash: avoid data loss when "git stash save" kills a directory" | Junio C Hamano | 2013-08-14 | 1 | -18/+0 |
* | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-08-09 | 1 | -1/+1 |
|\ | |||||
| * | t/t7407: fix two typos in submodule testsjk/submodule-subdirectory-ok | Phil Hord | 2013-08-09 | 1 | -1/+1 |
* | | Merge branch 'es/blame-L-breakage' | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |
|\ \ | |||||
| * | | t8001, t8002: fix "blame -L :literal" test on NetBSDes/blame-L-breakage | René Scharfe | 2013-08-05 | 1 | -2/+2 |
* | | | Merge branch 'dn/test-reject-utf-16' | Junio C Hamano | 2013-08-05 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | t3900: test rejecting log message with NULs correctlydn/test-reject-utf-16 | Junio C Hamano | 2013-08-05 | 1 | -2/+2 |
| * | | | Add missing test file for UTF-16. | Brian M. Carlson | 2013-08-05 | 1 | -0/+0 |
* | | | | Merge branch 'jk/cat-file-batch-optim' | Junio C Hamano | 2013-08-02 | 1 | -7/+0 |
|\ \ \ \ | |||||
| * | | | | Revert "cat-file: split --batch input lines on whitespace" | Junio C Hamano | 2013-08-02 | 1 | -7/+0 |
| * | | | | Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim | Junio C Hamano | 2013-07-12 | 1 | -0/+18 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'ob/typofixes' | Junio C Hamano | 2013-08-01 | 6 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | many small typofixesob/typofixes | Ondřej Bílka | 2013-07-29 | 6 | -6/+6 |
* | | | | | | | Merge branch 'lf/echo-n-is-not-portable' | Junio C Hamano | 2013-08-01 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Avoid using `echo -n` anywherelf/echo-n-is-not-portable | Lukas Fleischer | 2013-07-29 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-08-01 | 1 | -2/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-clean: implement partial matching for selection | Jiang Xin | 2013-07-24 | 1 | -2/+38 |
* | | | | | | | | | Merge branch 'ml/avoid-using-grep-on-crlf-files' | Junio C Hamano | 2013-07-24 | 3 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | test-lib.sh - define and use GREP_STRIPS_CRml/avoid-using-grep-on-crlf-files | Mark Levedahl | 2013-07-18 | 3 | -2/+4 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-07-24 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...tr/line-log | Junio C Hamano | 2013-07-24 | 1 | -1/+0 |
| * | | | | | | | | | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixes | Eric Sunshine | 2013-07-23 | 1 | -1/+1 |
| * | | | | | | | | | range-set: satisfy non-empty ranges invariant | Eric Sunshine | 2013-07-23 | 1 | -1/+2 |
| * | | | | | | | | | t4211: demonstrate crash when first -L encountered is empty range | Eric Sunshine | 2013-07-23 | 1 | -0/+5 |
| * | | | | | | | | | t4211: demonstrate empty -L range crash | Eric Sunshine | 2013-07-23 | 1 | -0/+8 |
* | | | | | | | | | | Merge branch 'mv/merge-ff-tristate' | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | t7600: fix typo in test titlemv/merge-ff-tristate | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
* | | | | | | | | | | Sync with Git 1.8.3.4 | Junio C Hamano | 2013-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update URL to the marc.info mail archive | Ondřej Bílka | 2013-07-22 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jc/name-rev-exact-ref' | Junio C Hamano | 2013-07-22 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | describe: fix --contains when a tag is given as inputjc/name-rev-exact-ref | Junio C Hamano | 2013-07-18 | 1 | -0/+12 |
| * | | | | | | | | | | | name-rev: differentiate between tags and commits they point at | Junio C Hamano | 2013-07-18 | 1 | -0/+12 |
* | | | | | | | | | | | | Merge branch 'es/check-mailmap' | Junio C Hamano | 2013-07-22 | 1 | -0/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t4203: test check-mailmap command invocationes/check-mailmap | Eric Sunshine | 2013-07-13 | 1 | -0/+43 |
* | | | | | | | | | | | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-07-22 | 2 | -18/+493 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | test: run testcases with POSIX absolute paths on Windows | Jiang Xin | 2013-06-26 | 1 | -21/+23 |
| * | | | | | | | | | | | | test: add t7301 for git-clean--interactive | Jiang Xin | 2013-06-26 | 1 | -0/+439 |
| * | | | | | | | | | | | | path.c: refactor relative_path(), not only strip prefix | Jiang Xin | 2013-06-26 | 1 | -21/+18 |
| * | | | | | | | | | | | | test: add test cases for relative_path | Jiang Xin | 2013-06-26 | 1 | -0/+37 |
* | | | | | | | | | | | | | Merge branch 'hv/config-from-blob' | Junio C Hamano | 2013-07-22 | 1 | -0/+70 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | teach config --blob option to parse config from database | Heiko Voigt | 2013-07-12 | 1 | -0/+70 |
* | | | | | | | | | | | | | | Merge branch 'jk/t0008-sigpipe-fix' | Junio C Hamano | 2013-07-22 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | t0008: avoid SIGPIPE race condition on fifojk/t0008-sigpipe-fix | Jeff King | 2013-07-12 | 1 | -2/+10 |
* | | | | | | | | | | | | | | | Merge branch 'db/show-ref-head' | Junio C Hamano | 2013-07-22 | 1 | -0/+167 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | show-ref: make --head always show the HEAD refdb/show-ref-head | Doug Bell | 2013-07-17 | 1 | -0/+167 |
* | | | | | | | | | | | | | | | | Merge branch 'es/blame-L-breakage' | Junio C Hamano | 2013-07-22 | 3 | -112/+269 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | t8001/t8002 (blame): add blame -L :funcname tests | Eric Sunshine | 2013-07-17 | 1 | -2/+46 |
| * | | | | | | | | | | | | | | | t8001/t8002 (blame): add blame -L tests | Eric Sunshine | 2013-07-17 | 1 | -3/+101 |
| * | | | | | | | | | | | | | | | t8001/t8002 (blame): modernize style | Eric Sunshine | 2013-07-17 | 3 | -112/+127 |