Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | grep: rip out support for external grep | Junio C Hamano | 2010-01-13 | 1 | -3/+3 | |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/conflict-advice' | Junio C Hamano | 2010-01-20 | 2 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 | 2 | -3/+5 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2010-01-20 | 1 | -12/+51 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | difftool: Update copyright notices to list each year separately | David Aguilar | 2010-01-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | difftool: Use eval to expand '--extcmd' expressions | David Aguilar | 2010-01-15 | 1 | -0/+13 | |
| * | | | | | | | | | | | | | | | | | | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 2010-01-15 | 1 | -0/+8 | |
| * | | | | | | | | | | | | | | | | | | t7800-difftool.sh: Simplify the --extcmd test | David Aguilar | 2010-01-15 | 1 | -8/+5 | |
| * | | | | | | | | | | | | | | | | | | difftool: Allow specifying unconfigured commands with --extcmd | David Aguilar | 2010-01-09 | 1 | -1/+18 | |
| * | | | | | | | | | | | | | | | | | | difftool--helper: Remove use of the GIT_MERGE_TOOL variable | David Aguilar | 2010-01-09 | 1 | -9/+0 | |
| * | | | | | | | | | | | | | | | | | | git-difftool: Add '--gui' for selecting a GUI tool | David Aguilar | 2010-01-03 | 1 | -0/+12 | |
| * | | | | | | | | | | | | | | | | | | t7800-difftool: Set a bogus tool for use by tests | David Aguilar | 2010-01-03 | 1 | -1/+2 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'mh/rebase-fixup' | Junio C Hamano | 2010-01-20 | 2 | -31/+76 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | rebase -i: Retain user-edited commit messages after squash/fixup conflicts | Michael Haggerty | 2010-01-14 | 1 | -0/+36 | |
| * | | | | | | | | | | | | | | | | | | t3404: Set up more of the test repo in the "setup" step | Michael Haggerty | 2010-01-14 | 1 | -25/+26 | |
| * | | | | | | | | | | | | | | | | | | rebase -i: For fixup commands without squashes, do not start editor | Michael Haggerty | 2010-01-14 | 1 | -4/+3 | |
| * | | | | | | | | | | | | | | | | | | rebase -i: Improve consistency of commit count in generated commit messages | Michael Haggerty | 2010-01-14 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | t3404: Test the commit count in commit messages generated by "rebase -i" | Michael Haggerty | 2010-01-14 | 2 | -3/+12 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ns/rebase-auto-squash' | Junio C Hamano | 2010-01-20 | 1 | -0/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | rebase -i --autosquash: auto-squash commits | Nanako Shiraishi | 2010-01-06 | 1 | -0/+73 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/rebase-fixup' (early part) | Junio C Hamano | 2010-01-20 | 2 | -53/+94 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | rebase-i: Ignore comments and blank lines in peek_next_command | Michael Haggerty | 2010-01-12 | 1 | -0/+24 | |
| * | | | | | | | | | | | | | | | | | | | lib-rebase: Allow comments and blank lines to be added to the rebase script | Michael Haggerty | 2010-01-12 | 1 | -5/+16 | |
| * | | | | | | | | | | | | | | | | | | | lib-rebase: Provide clearer debugging info about what the editor did | Michael Haggerty | 2010-01-12 | 1 | -2/+3 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Add a command "fixup" to rebase --interactive | Michael Haggerty | 2009-12-07 | 2 | -3/+34 | |
| * | | | | | | | | | | | | | | | | | | t3404: Use test_commit to set up test repository | Michael Haggerty | 2009-12-06 | 1 | -46/+20 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'il/push-set-upstream' | Junio C Hamano | 2010-01-20 | 1 | -0/+69 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Add push --set-upstream | Ilari Liusvaara | 2010-01-16 | 1 | -0/+69 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/warn-author-committer-after-commit' | Junio C Hamano | 2010-01-20 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | commit: show interesting ident information in summary | Jeff King | 2010-01-14 | 1 | -1/+5 | |
| * | | | | | | | | | | | | | | | | | | | | strbuf_expand: convert "%%" to "%" | Jeff King | 2010-01-14 | 1 | -0/+7 | |
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/http-push-ref-status' | Junio C Hamano | 2010-01-20 | 1 | -0/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | transport-helper.c::push_refs(): ignore helper-reported status if ref is not ... | Tay Ray Chuan | 2010-01-09 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | transport.c::transport_push(): make ref status affect return value | Tay Ray Chuan | 2010-01-09 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | refactor ref status logic for pushing | Tay Ray Chuan | 2010-01-09 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs | Tay Ray Chuan | 2010-01-09 | 1 | -0/+21 | |
| * | | | | | | | | | | | | | | | | | | | | t5541-http-push.sh: add tests for non-fast-forward pushes | Tay Ray Chuan | 2010-01-09 | 1 | -0/+23 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'bk/fix-relative-gitdir-file' | Junio C Hamano | 2010-01-20 | 1 | -0/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Handle relative paths in submodule .git files | Brad King | 2010-01-09 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | Test update-index for a gitlink to a .git file | Brad King | 2010-01-09 | 1 | -0/+38 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/rerere' | Junio C Hamano | 2010-01-18 | 1 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -0/+15 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' | Junio C Hamano | 2010-01-18 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Remove empty directories when checking out a commit with fewer submodules | Peter Collingbourne | 2010-01-11 | 1 | -0/+9 | |
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tc/test-locate-httpd' | Junio C Hamano | 2010-01-17 | 1 | -6/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t/lib-http.sh: Restructure finding of default httpd location | Tarmigan Casebolt | 2010-01-06 | 1 | -6/+24 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/commit-status' | Junio C Hamano | 2010-01-17 | 1 | -0/+109 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | t7502: test commit.status, --status and --no-status | Junio C Hamano | 2010-01-13 | 1 | -0/+109 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' | Junio C Hamano | 2010-01-17 | 1 | -0/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | checkout -m path: fix recreating conflicts | Junio C Hamano | 2010-01-06 | 1 | -0/+57 |