summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
| * | | | | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-042-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | builtin-mv.c: check for unversionned files before looking at the destination.Matthieu Moy2009-02-042-5/+5
| | * | | | | | | | | | | | | | | Add a testcase for "git mv -f" on untracked files.Matthieu Moy2009-02-041-0/+8
| | * | | | | | | | | | | | | | | Missing && in t/t7001.sh.Matthieu Moy2009-02-041-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'wp/add-patch-find'Junio C Hamano2009-02-041-22/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | add -p: trap Ctrl-D in 'goto' modeThomas Rast2009-02-041-0/+3
| * | | | | | | | | | | | | | | | add -p: change prompt separator for 'g'Thomas Rast2009-02-041-1/+1
| * | | | | | | | | | | | | | | | In add --patch, Handle K,k,J,j slightly more gracefully.William Pursell2009-02-011-15/+28
| * | | | | | | | | | | | | | | | Add / command in add --patchWilliam Pursell2009-02-011-1/+27
| * | | | | | | | | | | | | | | | git-add -i/-p: Change prompt separater from slash to commaWilliam Pursell2009-02-011-7/+7
* | | | | | | | | | | | | | | | | Merge branch 'ns/am-slacker'Junio C Hamano2009-02-043-2/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | git-am: Add --ignore-date optionNanako Shiraishi2009-01-253-1/+37
| * | | | | | | | | | | | | | | | | am: Add --committer-date-is-author-date optionJunio C Hamano2009-01-252-1/+32
* | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-02-045-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-035-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | User-manual: "git stash <comment>" form is long goneWilliam Pursell2009-02-031-1/+1
| | * | | | | | | | | | | | | | | add test-dump-cache-tree in MakefileGuanqun Lu2009-02-032-1/+1
| | * | | | | | | | | | | | | | | fix typo in DocumentationGuanqun Lu2009-02-031-1/+1
| | * | | | | | | | | | | | | | | apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin2009-02-031-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | bash: offer to show (un)staged changesThomas Rast2009-02-031-2/+24
View Lorry Controller Status