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