summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mg/rev-list-one-side-only'Junio C Hamano2011-03-2210-69/+230
|\
| * git-log: put space after commit markMichael J Gruber2011-03-104-3/+13
| * t6007: test rev-list --cherryMichael J Gruber2011-03-091-0/+12
| * log --cherry: a synonymMichael J Gruber2011-03-092-1/+17
| * rev-list: documentation and test for --cherry-markMichael J Gruber2011-03-093-0/+34
| * revision.c: introduce --cherry-markMichael J Gruber2011-03-092-4/+21
| * rev-list/log: factor out revision mark generationMichael J Gruber2011-03-096-56/+26
| * rev-list: --left/right-only are mutually exclusiveJunio C Hamano2011-02-211-0/+4
| * rev-list: documentation and test for --left/right-onlyMichael J Gruber2011-02-213-4/+43
| * t6007: Make sure we test --cherry-pickMichael J Gruber2011-02-211-8/+41
| * revlist.c: introduce --left/right-only for unsymmetric pickingMichael J Gruber2011-02-212-0/+26
* | Merge branch 'js/maint-stash-index-copy'Junio C Hamano2011-03-221-6/+5
|\ \
| * | stash: copy the index using --index-output instead of cp -pJohannes Sixt2011-03-171-6/+5
| * | stash: fix incorrect quoting in cleanup of temporary filesJohannes Sixt2011-03-171-1/+1
* | | Merge branch 'tl/p4'Junio C Hamano2011-03-221-10/+27
|\ \ \
| * | | git-p4: Fix error message crash in P4Sync.commit.Tor Arvid Lund2011-03-151-1/+1
| * | | Teach git-p4 to ignore case in perforce filenames if configured.Tor Arvid Lund2011-03-151-7/+20
| * | | git-p4: Teach gitConfig method about arguments.Tor Arvid Lund2011-03-151-2/+6
* | | | Merge branch 'mg/doc-bisect-tweak-worktree'Junio C Hamano2011-03-221-23/+38
|\ \ \ \
| * | | | git-bisect.txt: example for bisecting with hot-fixMichael J Gruber2011-03-151-0/+33
| * | | | git-bisect.txt: streamline run presentationMichael J Gruber2011-03-151-26/+8
* | | | | Merge branch 'jn/test-sanitize-git-env'Junio C Hamano2011-03-228-47/+11
|\ \ \ \ \
| * | | | | tests: scrub environment of GIT_* variablesJonathan Nieder2011-03-151-18/+5
| * | | | | config: drop support for GIT_CONFIG_NOGLOBALJonathan Nieder2011-03-157-16/+4
| * | | | | gitattributes: drop support for GIT_ATTR_NOGLOBALJonathan Nieder2011-03-151-6/+1
| * | | | | tests: suppress system gitattributesJonathan Nieder2011-03-151-1/+2
| * | | | | tests: stop worrying about obsolete environment variablesJonathan Nieder2011-03-151-7/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'sp/maint-upload-pack-stop-early'Junio C Hamano2011-03-221-3/+24
|\ \ \ \ \
| * | | | | upload-pack: Implement no-done capabilityShawn O. Pearce2011-03-151-4/+16
| * | | | | upload-pack: More aggressively send 'ACK %s ready'Shawn O. Pearce2011-03-141-0/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sp/maint-fetch-pack-stop-early'Junio C Hamano2011-03-221-2/+16
|\ \ \ \ \
| * | | | | fetch-pack: Implement no-done capabilityShawn O. Pearce2011-03-151-3/+15
| * | | | | fetch-pack: Finish negotation if remote replies "ACK %s ready"Shawn O. Pearce2011-03-141-0/+2
| |/ / / /
* | | | | Merge branch 'jc/maint-rev-list-culled-boundary'Junio C Hamano2011-03-222-1/+26
|\ \ \ \ \
| * | | | | list-objects.c: don't add an unparsed NULL as a pending treeJunio C Hamano2011-03-142-1/+33
* | | | | | Merge branch 'jc/maint-fetch-alt'Junio C Hamano2011-03-225-32/+118
|\ \ \ \ \ \
| * | | | | | fetch-pack: objects in our alternates are available to usJunio C Hamano2011-03-172-1/+13
| * | | | | | refs_from_alternate: helper to use refs from alternatesJunio C Hamano2011-03-174-32/+106
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sg/complete-symmetric-diff'Junio C Hamano2011-03-221-14/+17
|\ \ \ \ \ \
| * | | | | | bash: complete 'git diff ...branc<TAB>'SZEDER Gábor2011-03-101-13/+16
| * | | | | | bash: fix misindented esac statement in __git_complete_file()SZEDER Gábor2011-03-101-1/+1
* | | | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano2011-03-228-172/+265
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'db/length-as-hash' into svn-feJonathan Nieder2011-03-221-69/+105
| |\ \ \ \ \ \ \
| | * | | | | | | vcs-svn: use strchr to find RFC822 delimiterDavid Barr2011-03-221-2/+5
| | * | | | | | | vcs-svn: implement perfect hash for top-level keysDavid Barr2011-03-221-50/+59
| | * | | | | | | vcs-svn: implement perfect hash for node-prop keysDavid Barr2011-03-221-19/+43
| * | | | | | | | vcs-svn: use strbuf for author, UUID, and URLDavid Barr2011-03-225-30/+43
| * | | | | | | | vcs-svn: use strbuf for revision logDavid Barr2011-03-221-20/+8
| |/ / / / / / /
| * | | | | | | vcs-svn: improve reporting of input errorsJonathan Nieder2011-03-222-5/+37
| * | | | | | | vcs-svn: make buffer_copy_bytes return length readJonathan Nieder2011-03-222-10/+11