summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t7607: clean up stray untracked fileJeff King2011-03-251-1/+2
* t7607: mark known breakage in test 11 as fixedJeff King2011-03-251-1/+1
* Merge branch 'kc/gitweb-pathinfo-w-anchor'Junio C Hamano2011-03-231-7/+20
|\
| * gitweb: fix #patchNN anchors when path_info is enabledKevin Cernekee2011-03-181-7/+20
* | Merge branch 'jn/fortify-source-workaround'Junio C Hamano2011-03-231-6/+11
|\ \
| * | run-command: prettify -D_FORTIFY_SOURCE workaroundJonathan Nieder2011-03-171-6/+11
* | | Merge branch 'jn/maint-c99-format'Junio C Hamano2011-03-236-81/+26
|\ \ \
| * | | unbreak and eliminate NO_C99_FORMATJonathan Nieder2011-03-175-55/+4
| * | | mktag: avoid %td in format stringJonathan Nieder2011-03-171-26/+22
* | | | Merge branch 'lt/default-abbrev'Junio C Hamano2011-03-235-3/+23
|\ \ \ \
| * | | | Rename core.abbrevlength back to core.abbrevJunio C Hamano2011-03-202-2/+2
| * | | | Make the default abbrev length configurableLinus Torvalds2011-03-115-3/+23
* | | | | Merge branch 'pk/stash-apply-status-relative'Junio C Hamano2011-03-232-1/+21
|\ \ \ \ \
| * | | | | Add test: git stash shows status relative to current dirPiotr Krukowiecki2011-03-201-0/+19
| * | | | | git stash: show status relative to current directoryPiotr Krukowiecki2011-03-141-1/+2
* | | | | | Merge branch 'jc/maint-diff-q-filter'Junio C Hamano2011-03-232-1/+9
|\ \ \ \ \ \
| * | | | | | diff --quiet: disable optimization when --diff-filter=X is usedJunio C Hamano2011-03-162-1/+9
* | | | | | | Merge branch 'pw/p4'Junio C Hamano2011-03-232-1/+26
|\ \ \ \ \ \ \
| * | | | | | | git-p4: test sync new branchPete Wyckoff2011-03-161-0/+23
| * | | | | | | git-p4: fix sync new branch regressionPete Wyckoff2011-03-161-1/+3
* | | | | | | | Update draft release notes to 1.7.5Junio C Hamano2011-03-221-0/+27
* | | | | | | | 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