Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/am-i18n-fix' | Junio C Hamano | 2012-09-07 | 1 | -2/+2 |
|\ | |||||
| * | am: quote string for translation before passing to eval_gettextln | Nguyễn Thái Ngọc Duy | 2012-08-22 | 1 | -2/+2 |
* | | Merge branch 'jk/config-warn-on-inaccessible-paths' | Junio C Hamano | 2012-09-07 | 6 | -10/+34 |
|\ \ | |||||
| * | | warn_on_inaccessible(): a helper to warn on inaccessible paths | Junio C Hamano | 2012-08-21 | 4 | -3/+11 |
| * | | attr: warn on inaccessible attribute files | Jeff King | 2012-08-21 | 1 | -1/+4 |
| * | | gitignore: report access errors of exclude files | Jeff King | 2012-08-21 | 1 | -2/+4 |
| * | | config: warn on inaccessible files | Jeff King | 2012-08-21 | 4 | -7/+18 |
* | | | Merge branch 'kk/maint-for-each-ref-multi-sort' | Junio C Hamano | 2012-09-07 | 2 | -1/+13 |
|\ \ \ | |||||
| * | | | for-each-ref: Fix sort with multiple keys | Kacper Kornet | 2012-08-21 | 2 | -2/+4 |
| * | | | t6300: test sort with multiple keys | Kacper Kornet | 2012-08-21 | 1 | -0/+10 |
* | | | | Merge branch 'lt/commit-tree-guess-utf-8' | Junio C Hamano | 2012-09-07 | 2 | -28/+88 |
|\ \ \ \ | |||||
| * | | | | commit/commit-tree: correct latin1 to utf-8 | Linus Torvalds | 2012-08-21 | 2 | -28/+88 |
* | | | | | Merge branch 'pw/p4-use-client-spec-branch-detection' | Junio C Hamano | 2012-09-07 | 4 | -41/+145 |
|\ \ \ \ \ | |||||
| * | | | | | git p4: make branch detection work with --use-client-spec | Pete Wyckoff | 2012-08-20 | 2 | -7/+32 |
| * | | | | | git p4: do wildcard decoding in stripRepoPath | Pete Wyckoff | 2012-08-11 | 1 | -9/+8 |
| * | | | | | git p4: set self.branchPrefixes in initialization | Pete Wyckoff | 2012-08-11 | 1 | -11/+14 |
| * | | | | | 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 'tr/maint-parseopt-avoid-empty' | Junio C Hamano | 2012-09-07 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gettext: do not translate empty string | Thomas Rast | 2012-08-20 | 1 | -0/+2 |
* | | | | | | | 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 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Update mailmap for a handful of folks | Junio C Hamano | 2012-09-03 | 1 | -0/+9 |
* | | | | | | | The third batch for 1.8.0 | Junio C Hamano | 2012-09-03 | 1 | -0/+45 |
* | | | | | | | Merge branch 'js/use-sc-open-max' | Junio C Hamano | 2012-09-03 | 1 | -7/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sha1_file.c: introduce get_max_fd_limit() helper | Joachim Schmitz | 2012-08-24 | 1 | -7/+19 |
* | | | | | | | | Merge branch 'js/compat-mkdir' | Junio C Hamano | 2012-09-03 | 2 | -0/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | compat: some mkdir() do not like a slash at the end | Joachim Schmitz | 2012-08-24 | 2 | -0/+29 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'js/no-curl-easy-strerror-on-old-curl' | Junio C Hamano | 2012-09-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | http.c: don't use curl_easy_strerror prior to curl-7.12.0 | Joachim Schmitz | 2012-08-23 | 1 | -0/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/maint-mergetool-style-fix' | Junio C Hamano | 2012-09-03 | 1 | -273/+308 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mergetool: style fixes | Junio C Hamano | 2012-08-23 | 1 | -273/+308 |
* | | | | | | | | | Merge branch 'sz/submodule-force-update' | Junio C Hamano | 2012-09-03 | 3 | -2/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make 'git submodule update --force' always check out submodules. | Stefan Zager | 2012-08-24 | 3 | -2/+21 |
* | | | | | | | | | | Merge branch 'ph/stash-rerere' | Junio C Hamano | 2012-09-03 | 2 | -0/+39 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | stash: invoke rerere in case of conflict | Phil Hord | 2012-08-17 | 2 | -1/+2 |
| * | | | | | | | | | | test: git-stash conflict sets up rerere | Phil Hord | 2012-08-17 | 1 | -0/+38 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/daemon-access-hook' | Junio C Hamano | 2012-09-03 | 2 | -0/+93 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | daemon: --access-hook option | Junio C Hamano | 2012-08-15 | 2 | -0/+93 |
* | | | | | | | | | | | Merge branch 'jc/send-email-reconfirm' | Junio C Hamano | 2012-09-03 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | send-email: validate & reconfirm interactive responses | Junio C Hamano | 2012-08-14 | 1 | -3/+13 |
* | | | | | | | | | | | | Merge branch 'cw/cherry-pick-allow-empty-message' | Junio C Hamano | 2012-09-03 | 5 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | cherry-pick: add --allow-empty-message option | Chris Webb | 2012-08-06 | 5 | -0/+16 |
* | | | | | | | | | | | | | Merge branch 'jc/maint-sane-execvp-notdir' | Junio C Hamano | 2012-09-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |