summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin2008-07-1515-66/+66
* Update draft release notes to 1.6.0Junio C Hamano2008-07-151-1/+17
* shortlog: support --pretty=format: optionJohannes Schindelin2008-07-152-0/+12
* Make git-add -i accept ranges like 7-Ciaran McCreesh2008-07-152-5/+6
* t9600: allow testing with cvsps 2.2, including beta versionsPavel Roskin2008-07-151-2/+2
* Merge git://repo.or.cz/git-guiJunio C Hamano2008-07-152-3/+8
|\
| * git-gui: MERGE_RR lives in .git/ directly with newer Git versionsJohannes Schindelin2008-07-131-0/+1
| * git-gui: Exit shortcut in MacOSX repairedSoeren Finster2008-07-081-3/+7
* | Merge branch 'js/merge-rr'Junio C Hamano2008-07-143-5/+5
|\ \
| * | Move MERGE_RR from .git/rr-cache/ into .git/Johannes Schindelin2008-07-133-5/+5
* | | Merge branch 'sb/rerere-lib'Junio C Hamano2008-07-146-355/+390
|\ \ \
| * | | rerere: Separate libgit and builtin functionsStephan Beyer2008-07-106-355/+390
| |/ /
* | | Merge branch 'ls/maint-mailinfo-patch-label'Junio C Hamano2008-07-147-2/+104
|\ \ \
| * | | git-mailinfo: Fix getting the subject from the in-body [PATCH] lineLukas Sandström2008-07-137-2/+104
* | | | Merge branch 'om/rerere-careful'Junio C Hamano2008-07-142-9/+33
|\ \ \ \ | | |/ / | |/| |
| * | | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-102-9/+33
* | | | Merge branch 'jc/branch-merged'Junio C Hamano2008-07-144-52/+93
|\ \ \ \
| * | | | branch --merged/--no-merged: allow specifying arbitrary commitJunio C Hamano2008-07-092-20/+57
| * | | | branch --contains: default to HEADJunio C Hamano2008-07-091-4/+8
| * | | | parse-options: add PARSE_OPT_LASTARG_DEFAULT flagPierre Habouzit2008-07-092-28/+28
* | | | | Merge branch 'jc/rebase-orig-head'Junio C Hamano2008-07-146-3/+14
|\ \ \ \ \
| * | | | | Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt2008-07-083-2/+11
| * | | | | Teach "am" and "rebase" to mark the original position with ORIG_HEADJunio C Hamano2008-07-073-1/+3
* | | | | | bash completion: Remove dashed command completion supportShawn O. Pearce2008-07-141-54/+0
* | | | | | Merge branch 'sp/maint-bash-completion-optim'Junio C Hamano2008-07-141-3/+34
|\ \ \ \ \ \
| * | | | | | bash completion: Resolve git show ref:path<tab> losing ref: portionShawn O. Pearce2008-07-141-2/+25
| * | | | | | bash completion: Append space after file names have been completedShawn O. Pearce2008-07-131-1/+9
* | | | | | | restore legacy behavior for read_sha1_file()Nicolas Pitre2008-07-143-4/+89
* | | | | | | bash: Add long option completion for 'git send-email'Teemu Likonen2008-07-141-0/+20
* | | | | | | git-submodule - register submodule URL if adding in placeMark Levedahl2008-07-141-0/+10
* | | | | | | git-submodule - make "submodule add" more strict, and document itMark Levedahl2008-07-143-45/+48
* | | | | | | git-svn: typofixFrederik Schwarzer2008-07-141-1/+1
* | | | | | | git-svn: find-rev and rebase for SVN::Mirror repositoriesJoão Abecasis2008-07-142-4/+44
* | | | | | | tutorial: clarify "pull" is "fetch + merge"Junio C Hamano2008-07-141-1/+27
* | | | | | | tutorial: use prompt with user names in example, to clarify who is doing whatIan Katz2008-07-141-13/+13
* | | | | | | Update draft release notes for 1.6.0Junio C Hamano2008-07-131-1/+38
* | | | | | | Merge branch 'sp/maint-bash-completion-optim'Junio C Hamano2008-07-131-15/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | bash completion: Don't offer "a.." as a completion for "a."Shawn O. Pearce2008-07-131-3/+0
| * | | | | | bash completion: Improve responsiveness of git-log completionShawn O. Pearce2008-07-131-12/+16
* | | | | | | git-request-pull: replace call to deprecated peek-remoteRamsay Jones2008-07-131-1/+1
* | | | | | | Make rebase--interactive use OPTIONS_SPECStephan Beyer2008-07-131-26/+51
* | | | | | | t3404: test two "preserve merges with -p" casesStephan Beyer2008-07-131-5/+21
* | | | | | | git-am/git-mailsplit: correct synopsis for reading from stdinStephan Beyer2008-07-133-4/+4
* | | | | | | Merge branch 'maint' to sync with 1.5.6.3Junio C Hamano2008-07-138-22/+61
|\ \ \ \ \ \ \
| * | | | | | | GIT 1.5.6.3v1.5.6.3Junio C Hamano2008-07-132-9/+20
| * | | | | | | git-am: Do not exit silently if committer is unsetStephan Beyer2008-07-131-1/+2
| * | | | | | | t0004: fix timing bugJunio C Hamano2008-07-121-9/+10
| | |_|_|_|/ / | |/| | | | |
| * | | | | | git-mailinfo: document the -n optionLukas Sandström2008-07-112-2/+5
| * | | | | | Fix backwards-incompatible handling of core.sharedRepositoryPetr Baudis2008-07-112-1/+24
| |/ / / / /
* | | | | | Merge branch 'ph/parseopt-step-blame'Junio C Hamano2008-07-138-673/+788
|\ \ \ \ \ \
View Lorry Controller Status