summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Honor -p<n> when applying git diffsShawn O. Pearce2007-04-052-2/+27
| * | | Fix dependency of common-cmds.hJunio C Hamano2007-04-051-1/+1
| * | | Fix renaming branch without config fileGeert Bosch2007-04-052-2/+12
| * | | DESTDIR support for git/contrib/emacsVille Skyttä2007-04-051-2/+2
| * | | gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patchesJakub Narebski2007-04-051-2/+4
| * | | Document --left-right option to rev-list.Brian Gernhardt2007-04-052-0/+32
| * | | Revert "builtin-archive: use RUN_SETUP"René Scharfe2007-04-053-1/+7
| * | | rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.Gerrit Pape2007-04-041-0/+0
| * | | rerere: make sorting really stable.Junio C Hamano2007-04-042-6/+10
View Lorry Controller Status