aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* rerere.autoupdate: change the message when autoupdate is in effectJunio C Hamano2008-07-16
* Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-15
|\
| * reduce_heads(): protect from duplicate inputJunio C Hamano2008-07-14
| * reduce_heads(): thinkofixSverre Hvammen Johansen2008-07-13
| * Add a new test for git-merge-resolveMiklos Vajna2008-07-13
| * t6021: add a new test for git-merge-resolveMiklos Vajna2008-07-13
| * Teach merge.log to "git-merge" againJunio C Hamano2008-07-10
| * Build in mergeMiklos Vajna2008-07-07
| * Fix t7601-merge-pull-config.sh on AIXMiklos Vajna2008-07-06
| * git-commit-tree: make it usable from other builtinsMiklos Vajna2008-07-06
| * Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna2008-07-06
| * Add new test case to ensure git-merge reduces octopus parents when possibleMiklos Vajna2008-06-30
| * Introduce reduce_heads()Junio C Hamano2008-06-30
| * Introduce get_merge_bases_many()Junio C Hamano2008-06-30
| * Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-30
| * Introduce get_octopus_merge_bases() in commit.cMiklos Vajna2008-06-30
| * git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna2008-06-30
| * Move read_cache_unmerged() to read-cache.cMiklos Vajna2008-06-30
| * Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-30
| * Move parse-options's skip_prefix() to git-compat-util.hMiklos Vajna2008-06-30
| * Move commit_list_count() to commit.cMiklos Vajna2008-06-30
| * Move split_cmdline() to alias.cMiklos Vajna2008-06-30
* | Merge branch 'ag/rewrite_one'Junio C Hamano2008-07-15
|\ \
| * | Fix quadratic performance in rewrite_one.Alexander N. Gavrilov2008-07-13
* | | Merge branch 'sp/win'Junio C Hamano2008-07-15
|\ \ \
| * | | We need to check for msys as well as Windows in add--interactive.Mike Pape2008-07-11
| * | | Convert CR/LF to LF in tag signaturesJohannes Schindelin2008-07-11
| * | | Fixed text file auto-detection: treat EOF character 032 at the end of file as...Dmitry Kakurin2008-07-11
* | | | Merge branch 'js/more-win'Junio C Hamano2008-07-15
|\ \ \ \
| * | | | help (Windows): Display HTML in default browser using Windows' shell APISteffen Prohaska2008-07-13
| * | | | help.c: Add support for htmldir relative to git_exec_path()Steffen Prohaska2008-07-13
| * | | | Move code interpreting path relative to exec-dir to new function system_path()Steffen Prohaska2008-07-13
| |/ / /
* | | | Merge branch 'js/maint-pretty-mailmap'Junio C Hamano2008-07-15
|\ \ \ \
| * | | | Add pretty format %aN which gives the author name, respecting .mailmapJohannes Schindelin2008-07-11
| | |/ / | |/| |
* | | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-15
* | | | Update draft release notes to 1.6.0Junio C Hamano2008-07-15
* | | | shortlog: support --pretty=format: optionJohannes Schindelin2008-07-15
* | | | Make git-add -i accept ranges like 7-Ciaran McCreesh2008-07-15
* | | | t9600: allow testing with cvsps 2.2, including beta versionsPavel Roskin2008-07-15
* | | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-15
|\ \ \ \
| * | | | git-gui: MERGE_RR lives in .git/ directly with newer Git versionsJohannes Schindelin2008-07-13
| * | | | git-gui: Exit shortcut in MacOSX repairedSoeren Finster2008-07-08
* | | | | Merge branch 'js/merge-rr'Junio C Hamano2008-07-14
|\ \ \ \ \
| * | | | | Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin2008-07-13
* | | | | | Merge branch 'sb/rerere-lib'Junio C Hamano2008-07-14
|\ \ \ \ \ \
| * | | | | | rerere: Separate libgit and builtin functionsStephan Beyer2008-07-10
| |/ / / / /
* | | | | | Merge branch 'ls/maint-mailinfo-patch-label'Junio C Hamano2008-07-14
|\ \ \ \ \ \
| * | | | | | git-mailinfo: Fix getting the subject from the in-body [PATCH] lineLukas Sandström2008-07-13
* | | | | | | Merge branch 'om/rerere-careful'Junio C Hamano2008-07-14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-10
| | |_|_|/ / | |/| | | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 21:26:26 +0000