Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'mz/cherry-pick-cmdline-order' | Junio C Hamano | 2012-09-10 |
|\ | |||
| * | cherry-pick/revert: respect order of revisions to pick | Martin von Zweigbergk | 2012-08-30 |
| * | demonstrate broken 'git cherry-pick three one two' | Martin von Zweigbergk | 2012-08-30 |
| * | teach log --no-walk=unsorted, which avoids sorting | Martin von Zweigbergk | 2012-08-30 |
* | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' | Junio C Hamano | 2012-09-10 |
|\ \ | |||
| * | | log: fix --quiet synonym for -s | Jeff King | 2012-08-28 |
| * | | Merge branch 'mk/test-seq' into maint-1.7.11 | Junio C Hamano | 2012-08-24 |
| |\ \ | |||
* | \ \ | Merge branch 'jk/maint-http-half-auth-push' | Junio C Hamano | 2012-09-07 |
|\ \ \ \ | |||
| * | | | | http: prompt for credentials on failed POST | Jeff King | 2012-08-27 |
| * | | | | t: test http access to "half-auth" repositories | Jeff King | 2012-08-27 |
| * | | | | t: test basic smart-http authentication | Jeff King | 2012-08-27 |
| * | | | | t/lib-httpd: recognize */smart/* repos as smart-http | Jeff King | 2012-08-27 |
| * | | | | t/lib-httpd: only route auth/dumb to dumb repos | Jeff King | 2012-08-27 |
| * | | | | t5550: factor out http auth setup | Jeff King | 2012-08-27 |
| * | | | | t5550: put auth-required repo in auth/dumb | Jeff King | 2012-08-27 |
* | | | | | Merge branch 'jc/apply-binary-p0' | Junio C Hamano | 2012-09-07 |
|\ \ \ \ \ | |||
| * | | | | | apply: compute patch->def_name correctly under -p0 | Junio C Hamano | 2012-08-24 |
* | | | | | | Merge branch 'jc/dotdot-is-parent-directory' | Junio C Hamano | 2012-09-07 |
|\ \ \ \ \ \ | |||
| * | | | | | | specifying ranges: we did not mean to make ".." an empty set | Junio C Hamano | 2012-08-23 |
| | |_|/ / / | |/| | | | | |||
| * | | | | | Merge branch 'rj/maint-grep-remove-redundant-test' into maint | Junio C Hamano | 2012-08-15 |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge branch 'kk/maint-for-each-ref-multi-sort' | Junio C Hamano | 2012-09-07 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | for-each-ref: Fix sort with multiple keys | Kacper Kornet | 2012-08-21 |
| * | | | | | | | t6300: test sort with multiple keys | Kacper Kornet | 2012-08-21 |
* | | | | | | | | Merge branch 'pw/p4-use-client-spec-branch-detection' | Junio C Hamano | 2012-09-07 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git p4: make branch detection work with --use-client-spec | Pete Wyckoff | 2012-08-20 |
| * | | | | | | | | git p4 test: add broken --use-client-spec --detect-branches tests | Pete Wyckoff | 2012-08-11 |
| * | | | | | | | | git p4 test: move client_view() function to library | Pete Wyckoff | 2012-08-11 |
* | | | | | | | | | Merge branch 'nd/i18n-poison-test-updates' | Junio C Hamano | 2012-09-07 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Fix tests under GETTEXT_POISON on parseopt | Jiang Xin | 2012-08-27 |
| * | | | | | | | | | Fix tests under GETTEXT_POISON on git-remote | Jiang Xin | 2012-08-27 |
| * | | | | | | | | | Fix tests under GETTEXT_POISON on pack-object | Jiang Xin | 2012-08-27 |
| * | | | | | | | | | Fix tests under GETTEXT_POISON on git-apply | Jiang Xin | 2012-08-27 |
| * | | | | | | | | | Fix tests under GETTEXT_POISON on diffstat | Jiang Xin | 2012-08-27 |
| * | | | | | | | | | Fix tests under GETTEXT_POISON on git-stash | Jiang Xin | 2012-08-27 |
| * | | | | | | | | | Fix tests under GETTEXT_POISON on relative dates | Jiang Xin | 2012-08-27 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'sz/submodule-force-update' | Junio C Hamano | 2012-09-03 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Make 'git submodule update --force' always check out submodules. | Stefan Zager | 2012-08-24 |
* | | | | | | | | | | Merge branch 'ph/stash-rerere' | Junio C Hamano | 2012-09-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | stash: invoke rerere in case of conflict | Phil Hord | 2012-08-17 |
| * | | | | | | | | | | test: git-stash conflict sets up rerere | Phil Hord | 2012-08-17 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'cw/cherry-pick-allow-empty-message' | Junio C Hamano | 2012-09-03 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | cherry-pick: add --allow-empty-message option | Chris Webb | 2012-08-06 |
* | | | | | | | | | | | Merge branch 'ef/win32-cred-helper' | Junio C Hamano | 2012-08-29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | contrib: add win32 credential-helper | Erik Faye-Lund | 2012-08-16 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'hv/submodule-path-unmatch' | Junio C Hamano | 2012-08-29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Let submodule command exit with error status if path does not exist | Heiko Voigt | 2012-08-14 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'mz/empty-rebase-test' | Junio C Hamano | 2012-08-29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | add tests for 'git rebase --keep-empty' | Martin von Zweigbergk | 2012-08-09 |
* | | | | | | | | | | | | Merge branch 'js/grep-patterntype-config' | Junio C Hamano | 2012-08-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | grep: add a grep.patternType configuration setting | J Smith | 2012-08-03 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | |