Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" | Johannes Schindelin | 2008-07-15 | 5 | -20/+20 |
* | t9600: allow testing with cvsps 2.2, including beta versions | Pavel Roskin | 2008-07-15 | 1 | -2/+2 |
* | Merge branch 'js/merge-rr' | Junio C Hamano | 2008-07-14 | 1 | -3/+3 |
|\ | |||||
| * | Move MERGE_RR from .git/rr-cache/ into .git/ | Johannes Schindelin | 2008-07-13 | 1 | -3/+3 |
* | | Merge branch 'ls/maint-mailinfo-patch-label' | Junio C Hamano | 2008-07-14 | 6 | -1/+101 |
|\ \ | |||||
| * | | git-mailinfo: Fix getting the subject from the in-body [PATCH] line | Lukas Sandström | 2008-07-13 | 6 | -1/+101 |
* | | | Merge branch 'om/rerere-careful' | Junio C Hamano | 2008-07-14 | 1 | -6/+20 |
|\ \ \ | | |/ | |/| | |||||
| * | | builtin-rerere: more carefully find conflict markers | Olivier Marin | 2008-07-10 | 1 | -6/+20 |
* | | | restore legacy behavior for read_sha1_file() | Nicolas Pitre | 2008-07-14 | 1 | -0/+60 |
* | | | git-submodule - make "submodule add" more strict, and document it | Mark Levedahl | 2008-07-14 | 1 | -1/+1 |
* | | | git-svn: find-rev and rebase for SVN::Mirror repositories | João Abecasis | 2008-07-14 | 1 | -0/+9 |
* | | | t3404: test two "preserve merges with -p" cases | Stephan Beyer | 2008-07-13 | 1 | -5/+21 |
* | | | Merge branch 'maint' to sync with 1.5.6.3 | Junio C Hamano | 2008-07-13 | 2 | -9/+33 |
|\ \ \ | |||||
| * | | | t0004: fix timing bug | Junio C Hamano | 2008-07-12 | 1 | -9/+10 |
| | |/ | |/| | |||||
| * | | Fix backwards-incompatible handling of core.sharedRepository | Petr Baudis | 2008-07-11 | 1 | -0/+23 |
* | | | Merge branch 'am/stash-branch' | Junio C Hamano | 2008-07-13 | 1 | -0/+60 |
|\ \ \ | |||||
| * | | | Add a test for "git stash branch" | Abhijit Menon-Sen | 2008-07-06 | 1 | -0/+60 |
* | | | | Merge branch 'jc/report-tracking' | Junio C Hamano | 2008-07-13 | 1 | -0/+70 |
|\ \ \ \ | |||||
| * | | | | stat_tracking_info(): clear object flags used during counting | Junio C Hamano | 2008-07-03 | 1 | -0/+70 |
| |/ / / | |||||
* | | | | Merge branch 'js/pick-root' | Junio C Hamano | 2008-07-13 | 1 | -0/+30 |
|\ \ \ \ | |||||
| * | | | | Allow cherry-picking root commits | Johannes Schindelin | 2008-07-07 | 1 | -0/+30 |
* | | | | | Merge branch 'tr/add-i-e' | Junio C Hamano | 2008-07-13 | 1 | -0/+67 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | git-add--interactive: manual hunk editing mode | Thomas Rast | 2008-07-02 | 1 | -0/+67 |
* | | | | | apply: fix copy/rename breakage | Junio C Hamano | 2008-07-09 | 1 | -0/+20 |
* | | | | | Merge branch 'js/apply-root' | Junio C Hamano | 2008-07-09 | 1 | -0/+43 |
|\ \ \ \ \ | |||||
| * | | | | | git-apply --directory: make --root more similar to GNU diff | Junio C Hamano | 2008-07-06 | 1 | -4/+4 |
| * | | | | | apply --root: thinkofix. | Junio C Hamano | 2008-07-02 | 1 | -2/+13 |
| * | | | | | Teach "git apply" to prepend a prefix with "--root=<root>" | Johannes Schindelin | 2008-07-01 | 1 | -0/+32 |
* | | | | | | t9100-git-svn-basic.sh: Fix determination of utf-8 locale | Ramsay Jones | 2008-07-09 | 1 | -4/+4 |
* | | | | | | t9113-*.sh: provide user feedback when test skipped | Ramsay Jones | 2008-07-09 | 1 | -1/+7 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-07-09 | 2 | -1/+26 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Remove unnecessary pack-*.keep file after successful git-clone | Shawn O. Pearce | 2008-07-08 | 1 | -1/+19 |
| * | | | | | make deleting a missing ref more quiet | Jeff King | 2008-07-08 | 1 | -0/+7 |
* | | | | | | Avoid apache complaining about lack of server's FQDN | Mike Hommey | 2008-07-08 | 1 | -0/+1 |
* | | | | | | Skip t5540-http-push test when USE_CURL_MULTI is undefined | Mike Hommey | 2008-07-08 | 1 | -0/+7 |
* | | | | | | Fix http-push test | Mike Hommey | 2008-07-08 | 2 | -9/+11 |
* | | | | | | Catch failures from t5540-http-push | Mike Hommey | 2008-07-08 | 1 | -3/+4 |
* | | | | | | t7701-repack-unpack-unreachable.sh: check timestamp of unpacked objects | Brandon Casey | 2008-07-08 | 1 | -0/+34 |
* | | | | | | avoid null SHA1 in oldest reflog | Jeff King | 2008-07-08 | 1 | -1/+8 |
* | | | | | | Merge branch 'jc/rerere' | Junio C Hamano | 2008-07-07 | 1 | -3/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rerere.autoupdate | Junio C Hamano | 2008-06-22 | 1 | -0/+10 |
| * | | | | | | t4200: fix rerere test | Junio C Hamano | 2008-06-22 | 1 | -3/+3 |
* | | | | | | | Merge branch 'dr/ceiling' | Junio C Hamano | 2008-07-07 | 4 | -4/+255 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Add support for GIT_CEILING_DIRECTORIES | David Reiss | 2008-05-23 | 3 | -0/+211 |
| * | | | | | | Fold test-absolute-path into test-path-utils | David Reiss | 2008-05-23 | 1 | -4/+4 |
| * | | | | | | Implement normalize_absolute_path | David Reiss | 2008-05-23 | 1 | -0/+40 |
* | | | | | | | Fix apply --recount handling of no-EOL line | Thomas Rast | 2008-07-05 | 5 | -0/+28 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-07-04 | 2 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Fix executable bits in t/ scripts | Junio C Hamano | 2008-07-04 | 2 | -0/+0 |
* | | | | | | | t4127-apply-same-fn: Avoid sed -i | Johannes Sixt | 2008-07-04 | 1 | -11/+16 |
| |_|_|_|_|/ |/| | | | | |