Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with 1.7.11.2 | Junio C Hamano | 2012-07-11 | 2 | -1/+55 |
|\ | |||||
| * | Git 1.7.11.2v1.7.11.2 | Junio C Hamano | 2012-07-11 | 4 | -3/+57 |
| * | Merge branch 'jc/maint-blame-unique-abbrev' into maint | Junio C Hamano | 2012-07-11 | 1 | -4/+21 |
| |\ | |||||
| * \ | Merge branch 'rj/platform-pread-may-be-thread-unsafe' into maint | Junio C Hamano | 2012-07-11 | 2 | -2/+10 |
| |\ \ | |||||
| * \ \ | Merge branch 'th/diff-no-index-fixes' into maint | Junio C Hamano | 2012-07-11 | 5 | -24/+112 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'nd/clone-single-fix' into maint | Junio C Hamano | 2012-07-11 | 2 | -3/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/rev-list-simplify-merges-first-parent' into maint | Junio C Hamano | 2012-07-11 | 1 | -12/+29 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'hv/submodule-update-nuke-submodules' into maint | Junio C Hamano | 2012-07-11 | 1 | -6/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/diff-no-index-pager' into maint | Junio C Hamano | 2012-07-11 | 3 | -15/+22 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mm/verify-filename-fix' into maint | Junio C Hamano | 2012-07-11 | 8 | -10/+44 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'cn/cherry-pick-range-docs' into maint | Junio C Hamano | 2012-07-11 | 2 | -1/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/ustar-checksum-is-unsigned' into maint | Junio C Hamano | 2012-07-11 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/bundle-complete-notice' into maint | Junio C Hamano | 2012-07-11 | 1 | -6/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/ls-files-i-dir' into maint | Junio C Hamano | 2012-07-11 | 6 | -10/+109 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/request-pull-match-tagname' into maint | Junio C Hamano | 2012-07-11 | 1 | -7/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://github.com/git-l10n/git-po | Junio C Hamano | 2012-07-09 | 5 | -1090/+1727 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | l10n: zh_CN.po: translate 29 new messages | Jiang Xin | 2012-07-06 | 1 | -215/+351 |
| * | | | | | | | | | | | | | | | l10n: de.po: translate 29 new messages | Ralf Thielow | 2012-07-05 | 1 | -220/+349 |
| * | | | | | | | | | | | | | | | Update Swedish translation (1095t0f0u) | Peter Krefting | 2012-07-04 | 1 | -211/+334 |
| * | | | | | | | | | | | | | | | l10n: Update translation for Vietnamese | Tran Ngoc Quan | 2012-07-03 | 1 | -236/+364 |
| * | | | | | | | | | | | | | | | l10n: Update git.pot (29 new messages) | Jiang Xin | 2012-07-03 | 1 | -208/+329 |
* | | | | | | | | | | | | | | | | Fifth batch for 1.7.12 | Junio C Hamano | 2012-07-09 | 1 | -0/+43 |
* | | | | | | | | | | | | | | | | Merge branch 'cw/help-over-network' | Junio C Hamano | 2012-07-09 | 1 | -4/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Allow help.htmlpath to be a URL prefix | Chris Webb | 2012-06-28 | 1 | -3/+5 |
| * | | | | | | | | | | | | | | | | Add config variable to set HTML path for git-help --web | Chris Webb | 2012-06-28 | 1 | -1/+10 |
* | | | | | | | | | | | | | | | | | Merge branch 'mz/empty-rebase-test' | Junio C Hamano | 2012-07-09 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | add test case for rebase of empty commit | Martin von Zweigbergk | 2012-06-27 | 1 | -0/+8 |
* | | | | | | | | | | | | | | | | | | Merge branch 'pw/git-p4-tests' | Junio C Hamano | 2012-07-09 | 9 | -433/+574 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | git p4 test: fix badp4dir test | Pete Wyckoff | 2012-06-27 | 1 | -3/+7 |
| * | | | | | | | | | | | | | | | | | | git p4 test: split up big t9800 test | Pete Wyckoff | 2012-06-27 | 4 | -397/+506 |
| * | | | | | | | | | | | | | | | | | | git p4 test: cleanup_git should make a new $git | Pete Wyckoff | 2012-06-27 | 3 | -2/+3 |
| * | | | | | | | | | | | | | | | | | | git p4 test: copy source indeterminate | Pete Wyckoff | 2012-06-27 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | git p4 test: check for error message in failed test | Pete Wyckoff | 2012-06-27 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | git p4 test: rename some "git-p4 command" strings | Pete Wyckoff | 2012-06-27 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | git p4 test: never create default test repo | Pete Wyckoff | 2012-06-27 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | | | | | git p4 test: simplify quoting involving TRASH_DIRECTORY | Pete Wyckoff | 2012-06-27 | 4 | -21/+17 |
| * | | | | | | | | | | | | | | | | | | git p4 test: use real_path to resolve p4 client symlinks | Pete Wyckoff | 2012-06-27 | 3 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | git p4 test: wait longer for p4d to start and test its pid | Pete Wyckoff | 2012-06-27 | 1 | -6/+32 |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'js/fast-export-paths-with-spaces' | Junio C Hamano | 2012-07-09 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | fast-export: quote paths with spaces | Jay Soffian | 2012-06-27 | 2 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'cw/no-detaching-an-unborn' | Junio C Hamano | 2012-07-09 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | git-checkout: disallow --detach on unborn branch | Chris Webb | 2012-06-26 | 2 | -0/+8 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'vr/use-our-perl-in-tests' | Junio C Hamano | 2012-07-09 | 26 | -44/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | t/README: add a bit more Don'ts | Junio C Hamano | 2012-06-24 | 1 | -3/+22 |
| * | | | | | | | | | | | | | | | | | | | | tests: enclose $PERL_PATH in double quotes | Junio C Hamano | 2012-06-24 | 24 | -41/+41 |
| * | | | | | | | | | | | | | | | | | | | | t/test-lib.sh: export PERL_PATH for use in scripts | Junio C Hamano | 2012-06-24 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | | | t: Replace 'perl' by $PERL_PATH | Vincent van Ravesteijn | 2012-06-12 | 24 | -41/+41 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/credential-plumbing' | Junio C Hamano | 2012-07-09 | 13 | -97/+330 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | git-remote-mediawiki: update comments to reflect credential support | Matthieu Moy | 2012-07-08 | 1 | -6/+1 |
| * | | | | | | | | | | | | | | | | | | | | | git-remote-mediawiki: add credential support | Matthieu Moy | 2012-06-25 | 1 | -12/+94 |