Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mv: Fix spurious warning when moving a file in presence of submodulesjl/submodule-mv | Jens Lehmann | 2013-10-13 | 1 | -0/+26 |
* | Merge branch 'bc/submodule-status-ignored' | Jonathan Nieder | 2013-09-24 | 2 | -2/+20 |
|\ | |||||
| * | submodule: don't print status output with ignore=all | Brian M. Carlson | 2013-09-04 | 2 | -2/+20 |
* | | Merge branch 'cc/replace-with-the-same-type' | Jonathan Nieder | 2013-09-24 | 1 | -3/+22 |
|\ \ | |||||
| * | | t6050-replace: use some long option names | Christian Couder | 2013-09-06 | 1 | -4/+4 |
| * | | t6050-replace: add test to clean up all the replace refs | Christian Couder | 2013-09-06 | 1 | -0/+6 |
| * | | t6050-replace: test that objects are of the same type | Christian Couder | 2013-09-06 | 1 | -0/+13 |
| |/ | |||||
* | | Merge branch 'jk/shortlog-tolerate-broken-commit' | Jonathan Nieder | 2013-09-24 | 1 | -0/+16 |
|\ \ | |||||
| * | | shortlog: ignore commits with missing authorsjk/shortlog-tolerate-broken-commit | Jeff King | 2013-09-18 | 1 | -0/+16 |
* | | | Merge branch 'jc/push-cas' | Jonathan Nieder | 2013-09-24 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | t5541: mark passing c-a-s test as successjc/push-cas | Jeff King | 2013-09-20 | 1 | -1/+1 |
* | | | | Merge branch 'fc/at-head' | Junio C Hamano | 2013-09-20 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | Add new @ shortcut for HEADfc/at-head | Felipe Contreras | 2013-09-12 | 1 | -0/+8 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'dw/check-ignore-sans-index' | Junio C Hamano | 2013-09-20 | 1 | -9/+63 |
|\ \ \ \ | |||||
| * | | | | check-ignore: Add option to ignore index contentsdw/check-ignore-sans-index | Dave Williams | 2013-09-12 | 1 | -9/+63 |
* | | | | | Merge branch 'bk/refs-multi-update' | Junio C Hamano | 2013-09-20 | 1 | -0/+632 |
|\ \ \ \ \ | |||||
| * | | | | | update-ref: add test cases covering --stdin signaturebk/refs-multi-update | Brad King | 2013-09-11 | 1 | -0/+632 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'nr/git-cd-to-a-directory' | Junio C Hamano | 2013-09-20 | 1 | -0/+84 |
|\ \ \ \ \ | |||||
| * | | | | | t0056: "git -C" test updatesnr/git-cd-to-a-directory | Nazri Ramliy | 2013-09-19 | 1 | -6/+8 |
| * | | | | | git: run in a directory given with -C option | Nazri Ramliy | 2013-09-09 | 1 | -0/+82 |
| |/ / / / | |||||
* | | | | | Merge branch 'jh/checkout-auto-tracking' | Junio C Hamano | 2013-09-20 | 2 | -4/+40 |
|\ \ \ \ \ | |||||
| * | | | | | t3200: fix failure on case-insensitive filesystemsjh/checkout-auto-tracking | Eric Sunshine | 2013-09-17 | 1 | -0/+1 |
| * | | | | | branch.c: Relax unnecessary requirement on upstream's remote ref name | Per Cederqvist | 2013-09-09 | 1 | -1/+1 |
| * | | | | | t3200: Add test demonstrating minor regression in 41c21f2 | Johan Herland | 2013-09-09 | 1 | -0/+34 |
| * | | | | | t3200: Minor fix when preparing for tracking failure | Johan Herland | 2013-09-09 | 1 | -1/+2 |
| * | | | | | t2024: Fix &&-chaining and a couple of typos | Johan Herland | 2013-09-09 | 1 | -3/+3 |
* | | | | | | Merge branch 'hu/cherry-pick-previous-branch' | Junio C Hamano | 2013-09-20 | 1 | -0/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cherry-pick: allow "-" as abbreviation of '@{-1}' | Hiroshige Umino | 2013-09-09 | 1 | -0/+20 |
* | | | | | | | Merge branch 'mm/status-without-comment-char' | Junio C Hamano | 2013-09-20 | 5 | -814/+875 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7508: avoid non-portable sed expressionmm/status-without-comment-char | Eric Sunshine | 2013-09-17 | 1 | -1/+2 |
| * | | | | | | | status: add missing blank line after list of "other" files | Matthieu Moy | 2013-09-06 | 1 | -0/+21 |
| * | | | | | | | tests: don't set status.displayCommentPrefix file-wide | Matthieu Moy | 2013-09-06 | 3 | -813/+793 |
| * | | | | | | | status: disable display of '#' comment prefix by default | Matthieu Moy | 2013-09-06 | 4 | -6/+67 |
| * | | | | | | | submodule summary: ignore --for-status option | Matthieu Moy | 2013-09-06 | 1 | -7/+5 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rh/peeling-tag-to-tag' | Junio C Hamano | 2013-09-20 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | peel_onion(): add support for <rev>^{tag} | Richard Hansen | 2013-09-03 | 1 | -0/+7 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-09-20 | 1 | -4/+85 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | status: always show tracking branch even no change | Jiang Xin | 2013-08-26 | 1 | -1/+33 |
| * | | | | | | | branch: report invalid tracking branch as gone | Jiang Xin | 2013-08-26 | 1 | -4/+53 |
* | | | | | | | | Merge branch 'nd/fetch-into-shallow' | Junio C Hamano | 2013-09-20 | 2 | -3/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add testcase for needless objects during a shallow fetchnd/fetch-into-shallow | Matthijs Kooijman | 2013-08-28 | 1 | -0/+11 |
| * | | | | | | | | upload-pack: delegate rev walking in shallow fetch to pack-objects | Nguyễn Thái Ngọc Duy | 2013-08-28 | 1 | -3/+0 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ks/p4-view-spec' | Junio C Hamano | 2013-09-18 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git p4 test: sanitize P4CHARSET | kazuki saitoh | 2013-08-11 | 1 | -1/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/duplicate-objects-in-packs' | Junio C Hamano | 2013-09-18 | 3 | -0/+257 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5308: check that index-pack --strict detects duplicate objects | Jeff King | 2013-09-04 | 1 | -0/+7 |
| * | | | | | | | | test index-pack on packs with recoverable delta cycles | Jeff King | 2013-08-24 | 1 | -0/+18 |
| * | | | | | | | | add tests for indexing packs with delta cycles | Jeff King | 2013-08-24 | 2 | -0/+81 |
| * | | | | | | | | sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP | Jeff King | 2013-08-24 | 2 | -0/+151 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'nd/git-dir-pointing-at-gitfile' | Junio C Hamano | 2013-09-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ |