aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/send-email-readable-message-id' into maintJunio C Hamano2016-05-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | Eighth batch for 2.9Junio C Hamano2016-04-29
* | | | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.8.2Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | Git 2.8.2v2.8.2Junio C Hamano2016-04-29
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/trace-doc-sample-fix' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/makefile-redirection-stderr' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/diff-multiple-identical-renames' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/msvc' into maintJunio C Hamano2016-04-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'st/verify-tag'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tag -v: verify directly rather than exec-ing verify-tagSantiago Torres2016-04-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify-tag: move tag verification code to tag.cSantiago Torres2016-04-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify-tag: prepare verify_tag for libificationSantiago Torres2016-04-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify-tag: update variable name and typeSantiago Torres2016-04-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7030: test verifying multiple tagsSantiago Torres2016-04-18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/verify-tag.c: ignore SIGPIPE in gpg-interfaceSantiago Torres2016-04-06
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/win32-mmap'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmap(win32): avoid expensive fstat() callJohannes Schindelin2016-04-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmap(win32): avoid copy-on-write when it is unnecessaryJohannes Schindelin2016-04-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | win32mmap: set errno appropriatelyJohannes Schindelin2016-04-22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano2016-04-21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3033: avoid 'ambiguous refs' warningJunio C Hamano2016-04-21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5504: drop sigpipe=ok from push testsJeff King2016-04-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: isolate sigpipe in demuxer threadJeff King2016-04-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send-pack: isolate sigpipe in demuxer threadJeff King2016-04-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run-command: teach async threads to ignore SIGPIPEJeff King2016-04-20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send-pack: close demux pipe before finishing async processJeff King2016-04-20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/replace-edit-use-editor-configuration'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace --edit: respect core.editorJohannes Schindelin2016-04-20
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/mv-submodule-fix'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mv: allow moving nested submodulesStefan Beller2016-04-19
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/test-helpers'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test helpers: move test-* to t/helper/ subdirectoryNguyễn Thái Ngọc Duy2016-04-15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: clean *.o files we createJunio C Hamano2016-04-15
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/user-useconfigonly'Junio C Hamano2016-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ident: give "please tell me" message upon useConfigOnly errorMarios Titas2016-04-01
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ident: check for useConfigOnly before auto-detection of name/emailMarios Titas2016-04-01
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-04-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-04-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin2016-04-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9 from vascool/frJean-Noël Avila2016-03-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr: don't translate "merge" as a parameterVasco Almeida2016-03-25
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida2016-03-25
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr: fix wrongly translated option nameVasco Almeida2016-03-25
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n: fr: fix transcation of "dir"Vasco Almeida2016-03-25
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /