Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'js/remote' | Junio C Hamano | 2008-03-11 |
|\ | |||
| * | builtin remote rm: remove symbolic refs, too | Johannes Schindelin | 2008-03-08 |
| * | remote: fix "update [group...]" | Johannes Schindelin | 2008-03-05 |
| * | builtin-remote: prune remotes correctly that were added with --mirror | Johannes Schindelin | 2008-03-01 |
| * | Make git-remote a builtin | Johannes Schindelin | 2008-03-01 |
| * | Test "git remote show" and "git remote prune" | Johannes Schindelin | 2008-03-01 |
* | | Merge branch 'lt/unpack-trees' | Junio C Hamano | 2008-03-11 |
|\ \ | |||
| * | | Make 'unpack_trees()' have a separate source and destination index | Linus Torvalds | 2008-03-09 |
* | | | Merge branch 'maint' | Junio C Hamano | 2008-03-11 |
|\ \ \ | |/ / |/| | | |||
| * | | t0021: tr portability fix for Solaris | Jeff King | 2008-03-11 |
| * | | launch_editor(): allow spaces in the filename | Johannes Schindelin | 2008-03-11 |
| * | | git rebase --abort: always restore the right commit | Mike Hommey | 2008-03-11 |
| * | | Merge branch 'kb/maint-filter-branch-disappear' into maint | Junio C Hamano | 2008-03-11 |
| |\ \ | |||
* | | | | Add a test for read-tree -u --reset with a D/F conflict | Jeff King | 2008-03-08 |
* | | | | Merge branch 'ph/parseopt' | Junio C Hamano | 2008-03-08 |
|\ \ \ \ | |||
| * | | | | parse-options: new option type to treat an option-like parameter as an argument. | Pierre Habouzit | 2008-03-02 |
* | | | | | Merge branch 'dp/clean-fix' | Junio C Hamano | 2008-03-08 |
|\ \ \ \ \ | |||
| * | | | | | git-clean: add tests for relative path | Junio C Hamano | 2008-03-07 |
| * | | | | | get_pathspec(): die when an out-of-tree path is given | Junio C Hamano | 2008-03-07 |
* | | | | | | Merge branch 'sp/fetch-optim' | Junio C Hamano | 2008-03-08 |
|\ \ \ \ \ \ | |||
| * | | | | | | Teach git-fetch to exploit server side automatic tag following | Shawn O. Pearce | 2008-03-04 |
| * | | | | | | git-pack-objects: Automatically pack annotated tags if object was packed | Shawn O. Pearce | 2008-03-04 |
| * | | | | | | Teach git-fetch to grab a tag at the same time as a commit | Shawn O. Pearce | 2008-03-03 |
* | | | | | | | Merge branch 'jc/am' | Junio C Hamano | 2008-03-08 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | am: read from the right mailbox when started from a subdirectory | Junio C Hamano | 2008-03-05 |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'kb/maint-filter-branch-disappear' | Junio C Hamano | 2008-03-08 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||
| * | | | | | | filter-branch: handle "disappearing tree" case correctly in subdir filter | Junio C Hamano | 2008-03-08 |
* | | | | | | | Merge branch 'maint' to sync with 1.5.4.4 | Junio C Hamano | 2008-03-08 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||
| * | | | | | | Really make the LF after reset in fast-import optional | Adeodato Simó | 2008-03-08 |
| * | | | | | | Merge branch 'js/maint-cvsexport' into maint | Junio C Hamano | 2008-03-08 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-07 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||
| * | | | | | | test-lib: fix TERM to dumb for test repeatability | Junio C Hamano | 2008-03-07 |
* | | | | | | | Merge branch 'js/reflog-delete' | Junio C Hamano | 2008-03-07 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | t3903-stash.sh: Add tests for new stash commands drop and pop | Brandon Casey | 2008-03-03 |
| * | | | | | | | t3903-stash.sh: Add missing '&&' to body of testcase | Brandon Casey | 2008-03-03 |
| * | | | | | | | Merge commit '74359821' into js/reflog-delete | Junio C Hamano | 2008-03-03 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'bc/reflog-fix' into js/reflog-delete | Junio C Hamano | 2008-02-22 |
| |\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Teach "git reflog" a subcommand to delete single entries | Johannes Schindelin | 2007-10-17 |
* | | | | | | | | | | Add a very basic test script for git mergetool | Charles Bailey | 2008-03-05 |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-04 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| * | | | | | | | | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options | Gerrit Pape | 2008-03-03 |
* | | | | | | | | | t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge | Mike Hommey | 2008-03-03 |
* | | | | | | | | | Fix test for cleanup failure in t7300 on Windows | Alex Riesen | 2008-03-03 |
* | | | | | | | | | t6120 (describe): check --long properly | Junio C Hamano | 2008-03-03 |
* | | | | | | | | | Add git-describe test for "verify annotated tag names on output" | Shawn O. Pearce | 2008-03-03 |
* | | | | | | | | | Test for packed tags in git-describe output | Shawn O. Pearce | 2008-03-03 |
* | | | | | | | | | Don't allow git-describe failures to go unnoticed in t6120 | Shawn O. Pearce | 2008-03-03 |
| |_|_|_|_|/ / / |/| | | | | | | | |||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-02 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||
| * | | | | | | | revert: actually check for a dirty index | Jeff King | 2008-03-02 |
| * | | | | | | | tests: introduce test_must_fail | Junio C Hamano | 2008-03-02 |