summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work treeMarcel M. Cary2009-02-072-23/+10
* Merge branch 'js/maint-remote-remove-mirror'Junio C Hamano2009-02-052-7/+58
|\
| * builtin-remote: make rm operation safer in mirrored repositoryJay Soffian2009-02-042-2/+53
| * builtin-remote: make rm() use properly named variable to hold return valueJay Soffian2009-02-031-5/+5
* | Merge branch 'js/notes'Junio C Hamano2009-02-0515-0/+504
|\ \
| * | git-notes: fix printing of multi-line notesTor Arne Vestbø2009-01-142-7/+38
| * | notes: fix core.notesRef documentationThomas Rast2009-01-131-6/+4
| * | Add an expensive test for git-notesJohannes Schindelin2009-01-111-0/+98
| * | Speed up git notes lookupJohannes Schindelin2009-01-111-11/+102
| * | Add a script to edit/inspect notesJohannes Schindelin2008-12-216-0/+179
| * | Introduce commit notesJohannes Schindelin2008-12-219-0/+107
* | | Merge branch 'jc/refuse-push-to-current'Junio C Hamano2009-02-052-18/+46
|\ \ \
| * | | receive-pack: explain what to do when push updates the current branchJunio C Hamano2009-02-032-18/+46
* | | | Merge branch 'rc/http-push'Junio C Hamano2009-02-051-37/+30
|\ \ \ \
| * | | | http-push: wrap signature of get_remote_object_urlTay Ray Chuan2009-02-031-1/+2
| * | | | http-push: add back underscore separator before lock tokenTay Ray Chuan2009-02-031-0/+1
| * | | | http-push.c: get_remote_object_url() is only used under USE_CURL_MULTIJunio C Hamano2009-02-021-7/+8
| * | | | http-push: refactor request url creationTay Ray Chuan2009-01-311-37/+27
| |/ / /
* | | | Merge branch 'gt/utf8-width'Junio C Hamano2009-02-053-5/+27
|\ \ \ \
| * | | | builtin-blame.c: Use utf8_strwidth for author's namesGeoffrey Thomas2009-02-041-5/+7
| * | | | utf8: add utf8_strwidth()Geoffrey Thomas2009-02-042-0/+20
* | | | | Merge branch 'jk/head-symref'Junio C Hamano2009-02-053-2/+46
|\ \ \ \ \
| * | | | | symbolic ref: refuse non-ref targets in HEADJeff King2009-01-292-0/+44
| * | | | | validate_headref: tighten ref-matching to just branchesJeff King2009-01-291-2/+2
| |/ / / /
* | | | | Merge branch 'cb/mergetool'Junio C Hamano2009-02-052-20/+70
|\ \ \ \ \
| * | | | | mergetool: fix running mergetool in sub-directoriesCharles Bailey2009-01-312-6/+5
| * | | | | mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey2009-01-311-19/+51
| * | | | | mergetool: respect autocrlf by using checkout-indexCharles Bailey2009-01-272-5/+24
* | | | | | Merge branch 'maint'Junio C Hamano2009-02-051-1/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-051-1/+4
| |\ \ \ \ \ \
| | * | | | | | Fixed broken git help -w when installing from RPMDavid J. Mellor2009-02-041-1/+4
| * | | | | | | Merge branch 'jc/maint-apply-fix' into maintJunio C Hamano2009-02-051-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'am/maint-push-doc' into maintJunio C Hamano2009-02-052-23/+34
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/maint-gitdir-in-subdir' into maintJunio C Hamano2009-02-052-1/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'lt/maint-wrap-zlib' into maintJunio C Hamano2009-02-059-34/+99
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-split-diff-metainfo' into maintJunio C Hamano2009-02-053-67/+99
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-all-implies-HEAD' into maintJunio C Hamano2009-02-056-2/+63
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2009-02-052-2/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Makefile: minor improvements for Mac OS X (Darwin)Jay Soffian2009-02-051-2/+4
* | | | | | | | | | | | | | | config.mak.in: define paths without trailing slashPascal Obry2009-02-051-2/+2
* | | | | | | | | | | | | | | Makefile: fix misdetection of relative pathnamesJunio C Hamano2009-02-051-2/+2
* | | | | | | | | | | | | | | Merge branch 'jc/fsck' (early part)Junio C Hamano2009-02-042-14/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fsck: check loose objects from alternate object stores by defaultJunio C Hamano2009-01-302-9/+24
| * | | | | | | | | | | | | | | fsck: HEAD is part of refsJunio C Hamano2009-01-302-5/+27
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | git-bundle doc: update examplesNanako Shiraishi2009-02-041-48/+84
* | | | | | | | | | | | | | | Replace deprecated dashed git commands in usageAlexander Potashev2009-02-0410-11/+11
* | | | | | | | | | | | | | | git-show-branch doc: show -g as synonym to --reflog in the listjidanni@jidanni.org2009-02-041-2/+2
* | | | | | | | | | | | | | | contrib git-resurrect: find traces of a branch name and resurrect itThomas Rast2009-02-041-0/+180
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-02-043-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | urls.txt: document optional port specification in git URLSStefan Naewe2009-02-041-4/+4