summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* GIT 1.6.2-rc0v1.6.2-rc0Junio C Hamano2009-02-072-16/+58
* Merge branch 'tr/add-p-single'Junio C Hamano2009-02-072-16/+73
|\
| * add -p: import Term::ReadKey with 'require'Thomas Rast2009-02-071-1/+4
| * add -p: print errors in separate colorThomas Rast2009-02-052-12/+22
| * add -p: prompt for single charactersThomas Rast2009-02-052-4/+48
* | Merge branch 'js/filter-branch-submodule'Junio C Hamano2009-02-072-14/+17
|\ \
| * | filter-branch: do not consider diverging submodules a 'dirty worktree'Johannes Schindelin2009-02-051-1/+1
| * | filter-branch: Fix fatal error on bare repositoriesEric Kidd2009-02-032-13/+16
* | | Merge branch 'maint'Junio C Hamano2009-02-071-0/+32
|\ \ \
| * | | GIT 1.6.1.3v1.6.1.3Junio C Hamano2009-02-073-2/+34
* | | | emacs: Remove the no longer maintained vc-git package.Alexandre Julliard2009-02-072-217/+1
* | | | git.el: Add some notes about Emacs versions compatibility.Alexandre Julliard2009-02-071-2/+10
* | | | git.el: Use integer instead of character constants in case statement.Alexandre Julliard2009-02-071-15/+15
* | | | git.el: Set a regexp for paragraph-separate in log-edit mode.Alexandre Julliard2009-02-071-0/+1
* | | | git.el: Make git-run-command-region display the error if any.Alexandre Julliard2009-02-071-19/+19
* | | | git.el: Add commands for cherry-pick and revert.Alexandre Julliard2009-02-071-0/+42
* | | | git.el: Add a command to create a new branch.Alexandre Julliard2009-02-071-0/+14
* | | | git.el: Add a checkout command.Alexandre Julliard2009-02-071-2/+31
* | | | 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
| |\ \ \ \ \ \ \ \ \ \