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