summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/am-i18n-fix'Junio C Hamano2012-09-071-2/+2
|\
| * am: quote string for translation before passing to eval_gettextlnNguyễn Thái Ngọc Duy2012-08-221-2/+2
* | Merge branch 'jk/config-warn-on-inaccessible-paths'Junio C Hamano2012-09-076-10/+34
|\ \
| * | warn_on_inaccessible(): a helper to warn on inaccessible pathsJunio C Hamano2012-08-214-3/+11
| * | attr: warn on inaccessible attribute filesJeff King2012-08-211-1/+4
| * | gitignore: report access errors of exclude filesJeff King2012-08-211-2/+4
| * | config: warn on inaccessible filesJeff King2012-08-214-7/+18
* | | Merge branch 'kk/maint-for-each-ref-multi-sort'Junio C Hamano2012-09-072-1/+13
|\ \ \
| * | | for-each-ref: Fix sort with multiple keysKacper Kornet2012-08-212-2/+4
| * | | t6300: test sort with multiple keysKacper Kornet2012-08-211-0/+10
* | | | Merge branch 'lt/commit-tree-guess-utf-8'Junio C Hamano2012-09-072-28/+88
|\ \ \ \
| * | | | commit/commit-tree: correct latin1 to utf-8Linus Torvalds2012-08-212-28/+88
* | | | | Merge branch 'pw/p4-use-client-spec-branch-detection'Junio C Hamano2012-09-074-41/+145
|\ \ \ \ \
| * | | | | git p4: make branch detection work with --use-client-specPete Wyckoff2012-08-202-7/+32
| * | | | | git p4: do wildcard decoding in stripRepoPathPete Wyckoff2012-08-111-9/+8
| * | | | | git p4: set self.branchPrefixes in initializationPete Wyckoff2012-08-111-11/+14
| * | | | | git p4 test: add broken --use-client-spec --detect-branches testsPete Wyckoff2012-08-111-0/+77
| * | | | | git p4 test: move client_view() function to libraryPete Wyckoff2012-08-112-17/+17
* | | | | | Merge branch 'tr/maint-parseopt-avoid-empty'Junio C Hamano2012-09-071-0/+2
|\ \ \ \ \ \
| * | | | | | gettext: do not translate empty stringThomas Rast2012-08-201-0/+2
* | | | | | | Merge branch 'nd/i18n-poison-test-updates'Junio C Hamano2012-09-0723-53/+83
|\ \ \ \ \ \ \
| * | | | | | | Fix tests under GETTEXT_POISON on parseoptJiang Xin2012-08-2711-22/+46
| * | | | | | | Fix tests under GETTEXT_POISON on git-remoteJiang Xin2012-08-271-11/+17
| * | | | | | | Fix tests under GETTEXT_POISON on pack-objectJiang Xin2012-08-272-4/+4
| * | | | | | | Fix tests under GETTEXT_POISON on git-applyJiang Xin2012-08-273-6/+6
| * | | | | | | Fix tests under GETTEXT_POISON on diffstatJiang Xin2012-08-274-8/+8
| * | | | | | | Fix tests under GETTEXT_POISON on git-stashJiang Xin2012-08-271-1/+1
| * | | | | | | Fix tests under GETTEXT_POISON on relative datesJiang Xin2012-08-271-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Update mailmap for a handful of folksJunio C Hamano2012-09-031-0/+9
* | | | | | | The third batch for 1.8.0Junio C Hamano2012-09-031-0/+45
* | | | | | | Merge branch 'js/use-sc-open-max'Junio C Hamano2012-09-031-7/+19
|\ \ \ \ \ \ \
| * | | | | | | sha1_file.c: introduce get_max_fd_limit() helperJoachim Schmitz2012-08-241-7/+19
* | | | | | | | Merge branch 'js/compat-mkdir'Junio C Hamano2012-09-032-0/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | compat: some mkdir() do not like a slash at the endJoachim Schmitz2012-08-242-0/+29
| |/ / / / / / /
* | | | | | | | Merge branch 'js/no-curl-easy-strerror-on-old-curl'Junio C Hamano2012-09-031-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | http.c: don't use curl_easy_strerror prior to curl-7.12.0Joachim Schmitz2012-08-231-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/maint-mergetool-style-fix'Junio C Hamano2012-09-031-273/+308
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetool: style fixesJunio C Hamano2012-08-231-273/+308
* | | | | | | | | Merge branch 'sz/submodule-force-update'Junio C Hamano2012-09-033-2/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-243-2/+21
* | | | | | | | | | Merge branch 'ph/stash-rerere'Junio C Hamano2012-09-032-0/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: invoke rerere in case of conflictPhil Hord2012-08-172-1/+2
| * | | | | | | | | | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/daemon-access-hook'Junio C Hamano2012-09-032-0/+93
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | daemon: --access-hook optionJunio C Hamano2012-08-152-0/+93
* | | | | | | | | | | Merge branch 'jc/send-email-reconfirm'Junio C Hamano2012-09-031-3/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | send-email: validate & reconfirm interactive responsesJunio C Hamano2012-08-141-3/+13
* | | | | | | | | | | | Merge branch 'cw/cherry-pick-allow-empty-message'Junio C Hamano2012-09-035-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cherry-pick: add --allow-empty-message optionChris Webb2012-08-065-0/+16
* | | | | | | | | | | | | Merge branch 'jc/maint-sane-execvp-notdir'Junio C Hamano2012-09-031-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \