Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | sane_execvp(): ignore non-directory on $PATH | Junio C Hamano | 2012-07-31 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'jc/maint-config-exit-status' | Junio C Hamano | 2012-09-03 | 3 | -6/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | config: "git config baa" should exit with status 1 | Junio C Hamano | 2012-07-30 | 3 | -6/+11 |
* | | | | | | | | | | Latter half of the second batch for 1.8.0 | Junio C Hamano | 2012-08-29 | 1 | -1/+30 |
* | | | | | | | | | | Merge branch 'rr/precompose-utf8-cleanup' | Junio C Hamano | 2012-08-29 | 1 | -25/+19 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | precompose-utf8: do not call checks for non-ascii "utf8" | Junio C Hamano | 2012-08-20 | 1 | -8/+8 |
| * | | | | | | | | | | cleanup precompose_utf8 | Robin Rosenberg | 2012-08-17 | 1 | -20/+14 |
* | | | | | | | | | | | Merge branch 'mh/maint-config-doc-proxy-command' | Junio C Hamano | 2012-08-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-config doc: unconfuse an example | Junio C Hamano | 2012-08-18 | 1 | -1/+1 |
| * | | | | | | | | | | | git-config.txt: fix example | Michael Haggerty | 2012-08-18 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ef/win32-cred-helper' | Junio C Hamano | 2012-08-29 | 3 | -0/+375 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | contrib: add win32 credential-helper | Erik Faye-Lund | 2012-08-16 | 3 | -0/+375 |
* | | | | | | | | | | | | Merge branch 'hv/submodule-path-unmatch' | Junio C Hamano | 2012-08-29 | 2 | -7/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Let submodule command exit with error status if path does not exist | Heiko Voigt | 2012-08-14 | 2 | -7/+52 |
* | | | | | | | | | | | | | Merge branch 'jc/capabilities' | Junio C Hamano | 2012-08-29 | 8 | -17/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fetch-pack: mention server version with verbose output | Jeff King | 2012-08-13 | 1 | -1/+8 |
| * | | | | | | | | | | | | | parse_feature_request: make it easier to see feature values | Jeff King | 2012-08-13 | 2 | -10/+39 |
| * | | | | | | | | | | | | | fetch-pack: do not ask for unadvertised capabilities | Junio C Hamano | 2012-08-10 | 1 | -0/+6 |
| * | | | | | | | | | | | | | do not send client agent unless server does first | Jeff King | 2012-08-10 | 2 | -4/+15 |
| * | | | | | | | | | | | | | send-pack: fix capability-sending logic | Jeff King | 2012-08-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | include agent identifier in capability string | Jeff King | 2012-08-03 | 6 | -6/+38 |
* | | | | | | | | | | | | | | Merge branch 'mg/rebase-i-onto-reflog-in-full' | Junio C Hamano | 2012-08-29 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rebase -i: use full onto sha1 in reflog | Michael J Gruber | 2012-08-10 | 1 | -2/+1 |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'mz/empty-rebase-test' | Junio C Hamano | 2012-08-29 | 1 | -1/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | add tests for 'git rebase --keep-empty' | Martin von Zweigbergk | 2012-08-09 | 1 | -1/+17 |
* | | | | | | | | | | | | | | | Merge branch 'jc/maint-protect-sh-from-ifs' | Junio C Hamano | 2012-08-29 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | sh-setup: protect from exported IFS | Junio C Hamano | 2012-08-08 | 1 | -0/+4 |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'bc/prune-info' | Junio C Hamano | 2012-08-29 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |