summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'jc/merge-subtree'Junio C Hamano2007-04-087-3/+373
|\ \ \
| * | | A new merge stragety 'subtree'.Junio C Hamano2007-04-077-3/+373
| |/ /
* | | Merge branch 'js/fetch-progress'Junio C Hamano2007-04-081-4/+10
|\ \ \
| * | | git-fetch: add --quietJunio C Hamano2007-03-091-4/+10
* | | | Merge branch 'maint'Junio C Hamano2007-04-082-22/+31
|\ \ \ \ | | |_|/ | |/| |
| * | | Add Documentation/cmd-list.made to .gitignoreJunio C Hamano2007-04-081-0/+1
| * | | git-svn: fix log command to avoid infinite loop on long commit messagesEric Wong2007-04-081-2/+9
| * | | git-svn: dcommit/rebase confused by patches with git-svn-id: linesEric Wong2007-04-081-20/+21
| * | | git-svn: bail out on incorrect command-line optionsEric Wong2007-04-081-1/+4
* | | | Start 1.5.2 cycle by prepareing RelNotes for it.Junio C Hamano2007-04-072-1/+77
* | | | Merge branch 'jc/read-tree-df' (early part)Junio C Hamano2007-04-074-28/+167
|\ \ \ \
| * | | | Fix switching to a branch with D/F when current branch has file D.Junio C Hamano2007-04-041-1/+112
| * | | | Fix twoway_merge that passed d/f conflict marker to merged_entry().Junio C Hamano2007-04-041-2/+8
| * | | | Fix read-tree --prefix=dir/.Junio C Hamano2007-04-041-0/+1
| * | | | unpack-trees: get rid of *indpos parameter.Junio C Hamano2007-04-042-9/+8
| * | | | unpack_trees.c: pass unpack_trees_options structure to keep_entry() as well.Junio C Hamano2007-04-041-7/+7
| * | | | add_cache_entry(): removal of file foo does not conflict with foo/barJunio C Hamano2007-04-041-9/+31
* | | | | Merge branch 'maint'Junio C Hamano2007-04-072-4/+50
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Prepare for 1.5.1.1Junio C Hamano2007-04-072-1/+47
| * | | cvsserver: small corrections to asciidoc documentationFrank Lichtenheld2007-04-071-4/+4
* | | | Merge branch 'jc/index-output'Junio C Hamano2007-04-0713-25/+66
|\ \ \ \
| * | | | git-read-tree --index-output=<file>Junio C Hamano2007-04-036-16/+30
| * | | | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-0313-23/+50
* | | | | Merge branch 'fp/make-j'Junio C Hamano2007-04-071-2/+2
|\ \ \ \ \
| * | | | | Makefile: Add '+' to QUIET_SUBDIR0 to fix parallel make.Fernando J. Pereda2007-04-051-2/+2
* | | | | | Merge branch 'cc/bisect'Junio C Hamano2007-04-073-66/+199
|\ \ \ \ \ \
| * | | | | | git-bisect: allow bisecting with only one bad commit.Junio C Hamano2007-04-062-45/+59
| * | | | | | t6030: add a bit more tests to git-bisectJunio C Hamano2007-04-061-1/+37
| * | | | | | git-bisect: modernizationJunio C Hamano2007-04-051-5/+4
| * | | | | | Documentation: bisect: "start" accepts one bad and many good commitsChristian Couder2007-04-051-4/+15
| * | | | | | Bisect: teach "bisect start" to optionally use one bad and many good revs.Christian Couder2007-04-052-26/+99
| |/ / / / /
* | | | | | Merge branch 'jc/checkout' (early part)Junio C Hamano2007-04-072-3/+64
|\ \ \ \ \ \
| * | | | | | checkout: allow detaching to HEAD even when switching to the tip of a branchJunio C Hamano2007-04-032-3/+64
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'maint'Junio C Hamano2007-04-0711-67/+87
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Documentation: tighten dependency for git.{html,txt}Junio C Hamano2007-04-062-4/+17
| * | | | | Makefile: iconv() on Darwin has the old interfaceArjen Laarhoven2007-04-061-0/+1
| * | | | | t5300-pack-object.sh: portability issue using /usr/bin/statArjen Laarhoven2007-04-061-5/+6
| * | | | | t3200-branch.sh: small language nitArjen Laarhoven2007-04-061-1/+1
| * | | | | usermanual.txt: some capitalization nitsArjen Laarhoven2007-04-061-4/+4
| * | | | | Make builtin-branch.c handle the git config fileLars Hjemli2007-04-062-10/+6
| * | | | | rename_ref(): only print a warning when config-file update failsLars Hjemli2007-04-061-1/+1
| * | | | | Distinguish branches by more than case in tests.Brian Gernhardt2007-04-061-3/+3
| * | | | | Avoid composing too long "References" header.YOSHIFUJI Hideaki / 吉藤英明2007-04-061-1/+1
| * | | | | cvsimport: Improve formating consistencyFrank Lichtenheld2007-04-061-3/+3
| * | | | | cvsimport: Reorder options in documentation for better understandingFrank Lichtenheld2007-04-061-27/+27
| * | | | | cvsimport: Improve usage error reportingFrank Lichtenheld2007-04-061-4/+6
| * | | | | cvsimport: Improve documentation of CVSROOT and CVS module determinationFrank Lichtenheld2007-04-061-2/+6
| * | | | | cvsimport: sync usage lines with existing optionsFrank Lichtenheld2007-04-062-5/+8
* | | | | | Merge branch 'maint'Junio C Hamano2007-04-0517-19/+98
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Fix lseek(2) calls with args 2 and 3 swappedDana How2007-04-052-2/+2
View Lorry Controller Status