Commit message (Expand) | Author | Age | |
---|---|---|---|
* | git wrapper: DWIM mistyped commands | Johannes Schindelin | 2008-08-31 |
* | Merge branch 'mv/merge-custom' | Junio C Hamano | 2008-08-27 |
|\ | |||
| * | t7606: fix custom merge test | Junio C Hamano | 2008-08-23 |
| * | Fix "git-merge -s bogo" help text | Junio C Hamano | 2008-08-20 |
| * | Update .gitignore to ignore git-help | Gustaf Hendeby | 2008-08-13 |
| * | Builtin git-help. | Miklos Vajna | 2008-08-02 |
| * | builtin-help: always load_command_list() in cmd_help() | Miklos Vajna | 2008-07-30 |
| * | Add a second testcase for handling invalid strategies in git-merge | Miklos Vajna | 2008-07-29 |
| * | Add a new test for using a custom merge strategy | Miklos Vajna | 2008-07-29 |
| * | builtin-merge: allow using a custom strategy | Miklos Vajna | 2008-07-29 |
| * | builtin-help: make some internal functions available to other builtins | Miklos Vajna | 2008-07-29 |
* | | Merge branch 'ml/submodule' | Junio C Hamano | 2008-08-27 |
|\ \ | |||
| * | | git-submodule.sh - Remove trailing / from URL if found | Mark Levedahl | 2008-08-21 |
| * | | git-submodule.sh - Remove trailing / from URL if found | Mark Levedahl | 2008-08-20 |
* | | | Merge branch 'am/cherry-pick-rerere' | Junio C Hamano | 2008-08-27 |
|\ \ \ | |||
| * | | | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-11 |
* | | | | Merge branch 'jc/add-addremove' | Junio C Hamano | 2008-08-27 |
|\ \ \ \ | |||
| * | | | | builtin-add.c: optimize -A option and "git add ." | Junio C Hamano | 2008-07-25 |
| * | | | | builtin-add.c: restructure the code for maintainability | Junio C Hamano | 2008-07-25 |
* | | | | | Merge branch 'np/verify-pack' | Junio C Hamano | 2008-08-27 |
|\ \ \ \ \ | |||
| * | | | | | discard revindex data when pack list changes | Nicolas Pitre | 2008-08-22 |
* | | | | | | Merge branch 'da/submodule-sync' | Junio C Hamano | 2008-08-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | git-submodule: add "sync" command | David Aguilar | 2008-08-25 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | ctype.c: protect tiny C preprocessor constants | Junio C Hamano | 2008-08-27 |
| * | | | | | | | index-pack: be careful after fixing up the header/footer | Linus Torvalds | 2008-08-27 |
* | | | | | | | | Make it possible to abort the submission of a change to Perforce | Simon Hausmann | 2008-08-27 |
* | | | | | | | | Merge branch 'af/maint-install-no-handlink' | Junio C Hamano | 2008-08-26 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Makefile: always provide a fallback when hardlinks fail | Andreas Färber | 2008-08-25 |
* | | | | | | | | | Merge branch 'jc/no-slim-shell' | Junio C Hamano | 2008-08-26 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Revert "Build-in "git-shell"" | Junio C Hamano | 2008-08-25 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-08-26 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | index-pack: setup git repository | Nguyễn Thái Ngọc Duy | 2008-08-26 |
| * | | | | | | | | | Suppress some bash redirection error messages | Ramsay Jones | 2008-08-26 |
| * | | | | | | | | | Fix a warning (on cygwin) to allow -Werror | Ramsay Jones | 2008-08-26 |
| * | | | | | | | | | Fix "git log -i --grep" | Jeff King | 2008-08-24 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | format-patch: use default diff format even with patch options | Jeff King | 2008-08-26 |
| |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Install git-shell in bindir, too | Tommi Virtanen | 2008-08-24 |
* | | | | | | | | Merge branch 'jc/no-slim-shell' | Junio C Hamano | 2008-08-24 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Build-in "git-shell" | Junio C Hamano | 2008-08-20 |
| * | | | | | | | shell: do not play duplicated definition games to shrink the executable | Junio C Hamano | 2008-08-19 |
* | | | | | | | | Merge branch 'maint' to sync with 1.6.0.1 | Junio C Hamano | 2008-08-24 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | GIT 1.6.0.1v1.6.0.1 | Junio C Hamano | 2008-08-24 |
| * | | | | | | | Merge branch 'ag/maint-combine-diff-fix' into maint | Junio C Hamano | 2008-08-24 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Respect core.autocrlf in combined diff | Alexander Gavrilov | 2008-08-23 |
| * | | | | | | | | Merge branch 'mv/maint-merge-fix' into maint | Junio C Hamano | 2008-08-24 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 |
| | |/ / / / / / / | |||
| * | | | | | | | | Documentation: clarify pager configuration | Jonathan Nieder | 2008-08-24 |
| * | | | | | | | | Documentation: clarify pager.<cmd> configuration | Jonathan Nieder | 2008-08-24 |
| * | | | | | | | | Clean up the git-p4 documentation | Simon Hausmann | 2008-08-24 |