summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | git-commit-tree: make it usable from other builtinsMiklos Vajna2008-07-062-30/+45
| * | | | | | | | | | Add new test case to ensure git-merge prepends the custom merge messageMiklos Vajna2008-07-061-0/+37
| * | | | | | | | | | Add new test case to ensure git-merge reduces octopus parents when possibleMiklos Vajna2008-06-301-0/+63
| * | | | | | | | | | Introduce reduce_heads()Junio C Hamano2008-06-302-0/+47
| * | | | | | | | | | Introduce get_merge_bases_many()Junio C Hamano2008-06-301-18/+38
| * | | | | | | | | | Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna2008-06-301-0/+52
| * | | | | | | | | | Introduce get_octopus_merge_bases() in commit.cMiklos Vajna2008-06-302-0/+28
| * | | | | | | | | | git-fmt-merge-msg: make it usable from other builtinsMiklos Vajna2008-06-302-66/+92
| * | | | | | | | | | Move read_cache_unmerged() to read-cache.cMiklos Vajna2008-06-303-24/+33
| * | | | | | | | | | Add new test to ensure git-merge handles pull.twohead and pull.octopusMiklos Vajna2008-06-301-0/+129
| * | | | | | | | | | Move parse-options's skip_prefix() to git-compat-util.hMiklos Vajna2008-06-303-19/+32
| * | | | | | | | | | Move commit_list_count() to commit.cMiklos Vajna2008-06-303-8/+9
| * | | | | | | | | | Move split_cmdline() to alias.cMiklos Vajna2008-06-303-53/+55
* | | | | | | | | | | Merge branch 'ag/rewrite_one'Junio C Hamano2008-07-151-6/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix quadratic performance in rewrite_one.Alexander N. Gavrilov2008-07-131-6/+24
* | | | | | | | | | | | Merge branch 'sp/win'Junio C Hamano2008-07-153-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | We need to check for msys as well as Windows in add--interactive.Mike Pape2008-07-111-1/+1
| * | | | | | | | | | | | Convert CR/LF to LF in tag signaturesJohannes Schindelin2008-07-111-0/+10
| * | | | | | | | | | | | Fixed text file auto-detection: treat EOF character 032 at the end of file as...Dmitry Kakurin2008-07-111-0/+4
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/more-win'Junio C Hamano2008-07-157-26/+58
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | help (Windows): Display HTML in default browser using Windows' shell APISteffen Prohaska2008-07-133-1/+38
| * | | | | | | | | | | | help.c: Add support for htmldir relative to git_exec_path()Steffen Prohaska2008-07-131-3/+5
| * | | | | | | | | | | | Move code interpreting path relative to exec-dir to new function system_path()Steffen Prohaska2008-07-134-22/+15
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/maint-pretty-mailmap'Junio C Hamano2008-07-152-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add pretty format %aN which gives the author name, respecting .mailmapJohannes Schindelin2008-07-112-2/+27
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-1515-66/+66
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Update draft release notes to 1.6.0Junio C Hamano2008-07-151-1/+17
* | | | | | | | | | shortlog: support --pretty=format: optionJohannes Schindelin2008-07-152-0/+12
* | | | | | | | | | Make git-add -i accept ranges like 7-Ciaran McCreesh2008-07-152-5/+6
* | | | | | | | | | t9600: allow testing with cvsps 2.2, including beta versionsPavel Roskin2008-07-151-2/+2
* | | | | | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-152-3/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-gui: MERGE_RR lives in .git/ directly with newer Git versionsJohannes Schindelin2008-07-131-0/+1
| * | | | | | | | | | git-gui: Exit shortcut in MacOSX repairedSoeren Finster2008-07-081-3/+7
* | | | | | | | | | | Merge branch 'js/merge-rr'Junio C Hamano2008-07-143-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin2008-07-133-5/+5
* | | | | | | | | | | | Merge branch 'sb/rerere-lib'Junio C Hamano2008-07-146-355/+390
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rerere: Separate libgit and builtin functionsStephan Beyer2008-07-106-355/+390
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ls/maint-mailinfo-patch-label'Junio C Hamano2008-07-147-2/+104
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | git-mailinfo: Fix getting the subject from the in-body [PATCH] lineLukas Sandström2008-07-137-2/+104
* | | | | | | | | | | | Merge branch 'om/rerere-careful'Junio C Hamano2008-07-142-9/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-102-9/+33
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/branch-merged'Junio C Hamano2008-07-144-52/+93
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch --merged/--no-merged: allow specifying arbitrary commitJunio C Hamano2008-07-092-20/+57
| * | | | | | | | | | | branch --contains: default to HEADJunio C Hamano2008-07-091-4/+8
| * | | | | | | | | | | parse-options: add PARSE_OPT_LASTARG_DEFAULT flagPierre Habouzit2008-07-092-28/+28
* | | | | | | | | | | | Merge branch 'jc/rebase-orig-head'Junio C Hamano2008-07-146-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt2008-07-083-2/+11
| * | | | | | | | | | | | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-073-1/+3
* | | | | | | | | | | | | bash completion: Remove dashed command completion supportShawn O. Pearce2008-07-141-54/+0
* | | | | | | | | | | | | Merge branch 'sp/maint-bash-completion-optim'Junio C Hamano2008-07-141-3/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
View Lorry Controller Status