aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* git wrapper: DWIM mistyped commandsJohannes Schindelin2008-08-31
* Merge branch 'mv/merge-custom'Junio C Hamano2008-08-27
|\
| * t7606: fix custom merge testJunio C Hamano2008-08-23
| * Fix "git-merge -s bogo" help textJunio C Hamano2008-08-20
| * Update .gitignore to ignore git-helpGustaf Hendeby2008-08-13
| * Builtin git-help.Miklos Vajna2008-08-02
| * builtin-help: always load_command_list() in cmd_help()Miklos Vajna2008-07-30
| * Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna2008-07-29
| * Add a new test for using a custom merge strategyMiklos Vajna2008-07-29
| * builtin-merge: allow using a custom strategyMiklos Vajna2008-07-29
| * builtin-help: make some internal functions available to other builtinsMiklos Vajna2008-07-29
* | Merge branch 'ml/submodule'Junio C Hamano2008-08-27
|\ \
| * | git-submodule.sh - Remove trailing / from URL if foundMark Levedahl2008-08-21
| * | git-submodule.sh - Remove trailing / from URL if foundMark Levedahl2008-08-20
* | | Merge branch 'am/cherry-pick-rerere'Junio C Hamano2008-08-27
|\ \ \
| * | | Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-11
* | | | Merge branch 'jc/add-addremove'Junio C Hamano2008-08-27
|\ \ \ \
| * | | | builtin-add.c: optimize -A option and "git add ."Junio C Hamano2008-07-25
| * | | | builtin-add.c: restructure the code for maintainabilityJunio C Hamano2008-07-25
* | | | | Merge branch 'np/verify-pack'Junio C Hamano2008-08-27
|\ \ \ \ \
| * | | | | discard revindex data when pack list changesNicolas Pitre2008-08-22
* | | | | | Merge branch 'da/submodule-sync'Junio C Hamano2008-08-27
|\ \ \ \ \ \
| * | | | | | git-submodule: add "sync" commandDavid Aguilar2008-08-25
* | | | | | | Merge branch 'maint'Junio C Hamano2008-08-27
|\ \ \ \ \ \ \
| * | | | | | | ctype.c: protect tiny C preprocessor constantsJunio C Hamano2008-08-27
| * | | | | | | index-pack: be careful after fixing up the header/footerLinus Torvalds2008-08-27
* | | | | | | | Make it possible to abort the submission of a change to PerforceSimon Hausmann2008-08-27
* | | | | | | | Merge branch 'af/maint-install-no-handlink'Junio C Hamano2008-08-26
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: always provide a fallback when hardlinks failAndreas Färber2008-08-25
* | | | | | | | | Merge branch 'jc/no-slim-shell'Junio C Hamano2008-08-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Build-in "git-shell""Junio C Hamano2008-08-25
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-08-26
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | index-pack: setup git repositoryNguyễn Thái Ngọc Duy2008-08-26
| * | | | | | | | | Suppress some bash redirection error messagesRamsay Jones2008-08-26
| * | | | | | | | | Fix a warning (on cygwin) to allow -WerrorRamsay Jones2008-08-26
| * | | | | | | | | Fix "git log -i --grep"Jeff King2008-08-24
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | format-patch: use default diff format even with patch optionsJeff King2008-08-26
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Install git-shell in bindir, tooTommi Virtanen2008-08-24
* | | | | | | | Merge branch 'jc/no-slim-shell'Junio C Hamano2008-08-24
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Build-in "git-shell"Junio C Hamano2008-08-20
| * | | | | | | shell: do not play duplicated definition games to shrink the executableJunio C Hamano2008-08-19
* | | | | | | | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-24
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | GIT 1.6.0.1v1.6.0.1Junio C Hamano2008-08-24
| * | | | | | | Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano2008-08-24
| |\ \ \ \ \ \ \
| | * | | | | | | Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-23
| * | | | | | | | Merge branch 'mv/maint-merge-fix' into maintJunio C Hamano2008-08-24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-23
| | |/ / / / / / /
| * | | | | | | | Documentation: clarify pager configurationJonathan Nieder2008-08-24
| * | | | | | | | Documentation: clarify pager.<cmd> configurationJonathan Nieder2008-08-24
| * | | | | | | | Clean up the git-p4 documentationSimon Hausmann2008-08-24