Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge: merge unborn index before setting ref | Jeff King | 2011-03-25 | 2 | -1/+5 |
* | t7607: clean up stray untracked file | Jeff King | 2011-03-25 | 1 | -1/+2 |
* | t7607: mark known breakage in test 11 as fixed | Jeff King | 2011-03-25 | 1 | -1/+1 |
* | Merge branch 'kc/gitweb-pathinfo-w-anchor' | Junio C Hamano | 2011-03-23 | 1 | -7/+20 |
|\ | |||||
| * | gitweb: fix #patchNN anchors when path_info is enabled | Kevin Cernekee | 2011-03-18 | 1 | -7/+20 |
* | | Merge branch 'jn/fortify-source-workaround' | Junio C Hamano | 2011-03-23 | 1 | -6/+11 |
|\ \ | |||||
| * | | run-command: prettify -D_FORTIFY_SOURCE workaround | Jonathan Nieder | 2011-03-17 | 1 | -6/+11 |
* | | | Merge branch 'jn/maint-c99-format' | Junio C Hamano | 2011-03-23 | 6 | -81/+26 |
|\ \ \ | |||||
| * | | | unbreak and eliminate NO_C99_FORMAT | Jonathan Nieder | 2011-03-17 | 5 | -55/+4 |
| * | | | mktag: avoid %td in format string | Jonathan Nieder | 2011-03-17 | 1 | -26/+22 |
* | | | | Merge branch 'lt/default-abbrev' | Junio C Hamano | 2011-03-23 | 5 | -3/+23 |
|\ \ \ \ | |||||
| * | | | | Rename core.abbrevlength back to core.abbrev | Junio C Hamano | 2011-03-20 | 2 | -2/+2 |
| * | | | | Make the default abbrev length configurable | Linus Torvalds | 2011-03-11 | 5 | -3/+23 |
* | | | | | Merge branch 'pk/stash-apply-status-relative' | Junio C Hamano | 2011-03-23 | 2 | -1/+21 |
|\ \ \ \ \ | |||||
| * | | | | | Add test: git stash shows status relative to current dir | Piotr Krukowiecki | 2011-03-20 | 1 | -0/+19 |
| * | | | | | git stash: show status relative to current directory | Piotr Krukowiecki | 2011-03-14 | 1 | -1/+2 |
* | | | | | | Merge branch 'jc/maint-diff-q-filter' | Junio C Hamano | 2011-03-23 | 2 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff --quiet: disable optimization when --diff-filter=X is used | Junio C Hamano | 2011-03-16 | 2 | -1/+9 |
* | | | | | | | Merge branch 'pw/p4' | Junio C Hamano | 2011-03-23 | 2 | -1/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-p4: test sync new branch | Pete Wyckoff | 2011-03-16 | 1 | -0/+23 |
| * | | | | | | | git-p4: fix sync new branch regression | Pete Wyckoff | 2011-03-16 | 1 | -1/+3 |
* | | | | | | | | Update draft release notes to 1.7.5 | Junio C Hamano | 2011-03-22 | 1 | -0/+27 |
* | | | | | | | | Merge branch 'mg/rev-list-one-side-only' | Junio C Hamano | 2011-03-22 | 10 | -69/+230 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-log: put space after commit mark | Michael J Gruber | 2011-03-10 | 4 | -3/+13 |
| * | | | | | | | | t6007: test rev-list --cherry | Michael J Gruber | 2011-03-09 | 1 | -0/+12 |
| * | | | | | | | | log --cherry: a synonym | Michael J Gruber | 2011-03-09 | 2 | -1/+17 |
| * | | | | | | | | rev-list: documentation and test for --cherry-mark | Michael J Gruber | 2011-03-09 | 3 | -0/+34 |
| * | | | | | | | | revision.c: introduce --cherry-mark | Michael J Gruber | 2011-03-09 | 2 | -4/+21 |
| * | | | | | | | | rev-list/log: factor out revision mark generation | Michael J Gruber | 2011-03-09 | 6 | -56/+26 |
| * | | | | | | | | rev-list: --left/right-only are mutually exclusive | Junio C Hamano | 2011-02-21 | 1 | -0/+4 |
| * | | | | | | | | rev-list: documentation and test for --left/right-only | Michael J Gruber | 2011-02-21 | 3 | -4/+43 |
| * | | | | | | | | t6007: Make sure we test --cherry-pick | Michael J Gruber | 2011-02-21 | 1 | -8/+41 |
| * | | | | | | | | revlist.c: introduce --left/right-only for unsymmetric picking | Michael J Gruber | 2011-02-21 | 2 | -0/+26 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/maint-stash-index-copy' | Junio C Hamano | 2011-03-22 | 1 | -6/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | stash: copy the index using --index-output instead of cp -p | Johannes Sixt | 2011-03-17 | 1 | -6/+5 |
| * | | | | | | | | stash: fix incorrect quoting in cleanup of temporary files | Johannes Sixt | 2011-03-17 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'tl/p4' | Junio C Hamano | 2011-03-22 | 1 | -10/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-p4: Fix error message crash in P4Sync.commit. | Tor Arvid Lund | 2011-03-15 | 1 | -1/+1 |
| * | | | | | | | | Teach git-p4 to ignore case in perforce filenames if configured. | Tor Arvid Lund | 2011-03-15 | 1 | -7/+20 |
| * | | | | | | | | git-p4: Teach gitConfig method about arguments. | Tor Arvid Lund | 2011-03-15 | 1 | -2/+6 |
* | | | | | | | | | Merge branch 'mg/doc-bisect-tweak-worktree' | Junio C Hamano | 2011-03-22 | 1 | -23/+38 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-bisect.txt: example for bisecting with hot-fix | Michael J Gruber | 2011-03-15 | 1 | -0/+33 |
| * | | | | | | | | | git-bisect.txt: streamline run presentation | Michael J Gruber | 2011-03-15 | 1 | -26/+8 |
* | | | | | | | | | | Merge branch 'jn/test-sanitize-git-env' | Junio C Hamano | 2011-03-22 | 8 | -47/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | tests: scrub environment of GIT_* variables | Jonathan Nieder | 2011-03-15 | 1 | -18/+5 |
| * | | | | | | | | | | config: drop support for GIT_CONFIG_NOGLOBAL | Jonathan Nieder | 2011-03-15 | 7 | -16/+4 |
| * | | | | | | | | | | gitattributes: drop support for GIT_ATTR_NOGLOBAL | Jonathan Nieder | 2011-03-15 | 1 | -6/+1 |
| * | | | | | | | | | | tests: suppress system gitattributes | Jonathan Nieder | 2011-03-15 | 1 | -1/+2 |
| * | | | | | | | | | | tests: stop worrying about obsolete environment variables | Jonathan Nieder | 2011-03-15 | 1 | -7/+0 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'sp/maint-upload-pack-stop-early' | Junio C Hamano | 2011-03-22 | 1 | -3/+24 |
|\ \ \ \ \ \ \ \ \ \ |