aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fast-import: implement unpack limitEric Wong2016-05-11
* Prepare for 2.8.2Junio C Hamano2016-04-14
* Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-14
|\
| * merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2016-03-23
* | Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-14
|\ \
| * | commit: do not lose SQUASH_MSG contentsSven Strickroth2016-03-21
* | | Merge branch 'jk/send-email-rtrim-mailrc-alias' into maintJunio C Hamano2016-04-14
|\ \ \
| * | | send-email: ignore trailing whitespace in mailrc alias fileJeff King2016-03-18
* | | | Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-14
|\ \ \ \
| * | | | mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar2016-03-10
| * | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-10
* | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-14
|\ \ \ \ \
| * | | | | use setup_git_directory() in test-* programsJeff King2016-03-07
| * | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-07
| * | | | | mailmap: do not resolve blobs in a non-repositoryJeff King2016-03-06
| * | | | | remote: don't resolve HEAD in non-repositoryJeff King2016-03-06
| * | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-06
| * | | | | setup: make startup_info available everywhereJeff King2016-03-06
* | | | | | Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \
| * | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorJeff King2016-03-05
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \
| * | | | | | xdiff/xprepare: fix a memory leakRamsay Jones2016-03-04
| * | | | | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-04
* | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \
| * | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsGabriel Souza Franco2016-03-05
| * | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-01
* | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: let some options run outside repositoryJeff King2016-02-29
| * | | | | | | | t1515: add tests for rev-parse out-of-repo helpersJeff King2016-02-28
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/git-config: fix --get-all descriptionJohn Keeping2016-02-28
| * | | | | | | | Documentation/git-config: use bulleted list for exit codesJohn Keeping2016-02-28
| * | | | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-28
| |/ / / / / / /
* | | | | | | | Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | t/t7502 : drop duplicate testPranit Bauva2016-03-11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envJeff King2016-03-18
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \
| * | | | | | | | clone tests: rename t57* => t56*Stefan Beller2016-03-16
* | | | | | | | | Merge branch 'jk/credential-cache-comment-exit' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | credential-cache--daemon: clarify "exit" action semanticsJeff King2016-03-18
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: add a helper function to derive .idx/.keep filenameJunio C Hamano2016-03-03
| * | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-03
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | index-pack: correct --keep[=<msg>]Junio C Hamano2016-03-03
* | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersSaurav Sachidanand2016-03-01
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mp/upload-pack-use-embedded-args' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | upload-pack: use argv_array for pack_objectsMichael Procter2016-02-25
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'oa/doc-diff-check' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \