Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make 'unpack_trees()' have a separate source and destination index | Linus Torvalds | 2008-03-09 | 1 | -1/+1 |
* | Add a test for read-tree -u --reset with a D/F conflict | Jeff King | 2008-03-08 | 1 | -0/+30 |
* | Merge branch 'ph/parseopt' | Junio C Hamano | 2008-03-08 | 1 | -0/+16 |
|\ | |||||
| * | parse-options: new option type to treat an option-like parameter as an argument. | Pierre Habouzit | 2008-03-02 | 1 | -0/+16 |
* | | Merge branch 'dp/clean-fix' | Junio C Hamano | 2008-03-08 | 3 | -4/+57 |
|\ \ | |||||
| * | | git-clean: add tests for relative path | Junio C Hamano | 2008-03-07 | 1 | -0/+52 |
| * | | get_pathspec(): die when an out-of-tree path is given | Junio C Hamano | 2008-03-07 | 2 | -4/+5 |
* | | | Merge branch 'sp/fetch-optim' | Junio C Hamano | 2008-03-08 | 2 | -0/+234 |
|\ \ \ | |||||
| * | | | Teach git-fetch to exploit server side automatic tag following | Shawn O. Pearce | 2008-03-04 | 1 | -0/+26 |
| * | | | git-pack-objects: Automatically pack annotated tags if object was packed | Shawn O. Pearce | 2008-03-04 | 1 | -0/+84 |
| * | | | Teach git-fetch to grab a tag at the same time as a commit | Shawn O. Pearce | 2008-03-03 | 1 | -0/+124 |
* | | | | Merge branch 'jc/am' | Junio C Hamano | 2008-03-08 | 1 | -0/+72 |
|\ \ \ \ | |||||
| * | | | | am: read from the right mailbox when started from a subdirectory | Junio C Hamano | 2008-03-05 | 1 | -0/+72 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'kb/maint-filter-branch-disappear' | Junio C Hamano | 2008-03-08 | 1 | -0/+24 |
|\ \ \ \ | |||||
| * | | | | filter-branch: handle "disappearing tree" case correctly in subdir filter | Junio C Hamano | 2008-03-08 | 1 | -0/+24 |
* | | | | | Merge branch 'maint' to sync with 1.5.4.4 | Junio C Hamano | 2008-03-08 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Really make the LF after reset in fast-import optional | Adeodato Simó | 2008-03-08 | 1 | -0/+2 |
| * | | | | | Merge branch 'js/maint-cvsexport' into maint | Junio C Hamano | 2008-03-08 | 1 | -0/+35 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-07 | 1 | -7/+17 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | test-lib: fix TERM to dumb for test repeatability | Junio C Hamano | 2008-03-07 | 1 | -7/+17 |
* | | | | | | Merge branch 'js/reflog-delete' | Junio C Hamano | 2008-03-07 | 2 | -3/+74 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t3903-stash.sh: Add tests for new stash commands drop and pop | Brandon Casey | 2008-03-03 | 1 | -1/+45 |
| * | | | | | | t3903-stash.sh: Add missing '&&' to body of testcase | Brandon Casey | 2008-03-03 | 1 | -2/+2 |
| * | | | | | | Merge commit '74359821' into js/reflog-delete | Junio C Hamano | 2008-03-03 | 19 | -32/+865 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'bc/reflog-fix' into js/reflog-delete | Junio C Hamano | 2008-02-22 | 159 | -733/+6954 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Teach "git reflog" a subcommand to delete single entries | Johannes Schindelin | 2007-10-17 | 1 | -0/+26 |
* | | | | | | | | | Add a very basic test script for git mergetool | Charles Bailey | 2008-03-05 | 1 | -0/+46 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-04 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options | Gerrit Pape | 2008-03-03 | 1 | -0/+6 |
* | | | | | | | | t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge | Mike Hommey | 2008-03-03 | 1 | -28/+40 |
* | | | | | | | | Fix test for cleanup failure in t7300 on Windows | Alex Riesen | 2008-03-03 | 1 | -1/+2 |
* | | | | | | | | t6120 (describe): check --long properly | Junio C Hamano | 2008-03-03 | 1 | -0/+1 |
* | | | | | | | | Add git-describe test for "verify annotated tag names on output" | Shawn O. Pearce | 2008-03-03 | 1 | -1/+16 |
* | | | | | | | | Test for packed tags in git-describe output | Shawn O. Pearce | 2008-03-03 | 1 | -0/+3 |
* | | | | | | | | Don't allow git-describe failures to go unnoticed in t6120 | Shawn O. Pearce | 2008-03-03 | 1 | -1/+3 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-02 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | revert: actually check for a dirty index | Jeff King | 2008-03-02 | 1 | -0/+9 |
| * | | | | | | tests: introduce test_must_fail | Junio C Hamano | 2008-03-02 | 2 | -8/+25 |
* | | | | | | | format-patch: wrap cover-letter's shortlog sensibly | Johannes Schindelin | 2008-03-02 | 2 | -2/+21 |
* | | | | | | | format-patch: use the diff options for the cover letter, too | Johannes Schindelin | 2008-03-02 | 1 | -4/+14 |
* | | | | | | | Merge branch 'cb/http-test' | Junio C Hamano | 2008-03-02 | 5 | -2/+218 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | http-push: add regression tests | Clemens Buchacher | 2008-02-27 | 5 | -2/+218 |
* | | | | | | | | Merge branch 'sb/describe-long' | Junio C Hamano | 2008-03-02 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-describe: --long shows the object name even for a tagged commit | Santi Béjar | 2008-02-25 | 1 | -0/+2 |
* | | | | | | | | | Fix make_absolute_path() for parameters without a slash | Johannes Schindelin | 2008-03-02 | 1 | -0/+2 |
* | | | | | | | | | diff: make sure work tree side is shown as 0{40} when different | Junio C Hamano | 2008-03-02 | 1 | -0/+53 |
* | | | | | | | | | git rebase --abort: always restore the right commit | Mike Hommey | 2008-03-01 | 1 | -1/+1 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Add test for git rebase --abort | Mike Hommey | 2008-03-01 | 1 | -0/+59 |
* | | | | | | | | t6024: move "git reset" to prepare for a test inside the test itself | Junio C Hamano | 2008-03-01 | 1 | -1/+1 |
* | | | | | | | | clone: support cloning full bundles | Santi Béjar | 2008-02-29 | 1 | -0/+45 |