summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-052-22/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | connect: improve check for plink to reduce false positivesbc/connect-plinkbrian m. carlson2015-04-282-3/+48
| * | | | | | | | | | | | | | | | | | | | | | | | | t5601: fix quotation error leading to skipped testsbrian m. carlson2015-04-281-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | connect: simplify SSH connection code pathbrian m. carlson2015-04-281-20/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-052-0/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: redo tasks that die during cherry-pickph/rebase-i-redoPhil Hord2015-04-292-0/+63
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | add: check return value of launch_editorjk/add-e-kill-editorJeff King2015-05-122-1/+9
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: call transport_set_verbosity before anything else on the newly created...mh/clone-verbosity-fixMike Hommey2015-05-191-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-052-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: squelch "packfile cannot be accessed" warningsjk/sha1-file-reduce-useless-warningsJeff King2015-03-302-6/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-052-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: CRLF in the working tree and LF in the repotb/blame-resurrect-convert-to-gitTorsten Bögershausen2015-05-032-3/+16
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-051-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fmt-merge-msg: plug small leak of commit bufferjc/plug-fmt-merge-msg-leakJunio C Hamano2015-04-201-5/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-0510-81/+243
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | path.c: remove home_config_paths()pt/xdg-config-pathPaul Tan2015-05-062-29/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-config: replace use of home_config_paths()Paul Tan2015-05-062-8/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-commit: replace use of home_config_paths()Paul Tan2015-05-061-5/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | credential-store.c: replace home_config_paths() with xdg_config_home()Paul Tan2015-05-061-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c: replace home_config_paths() with xdg_config_home()Paul Tan2015-05-061-5/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c: replace home_config_paths() with xdg_config_home()Paul Tan2015-05-061-5/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | path.c: implement xdg_config_home()Paul Tan2015-05-062-0/+22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0302: "unreadable" test needs POSIXPERMpt/credential-xdgJunio C Hamano2015-03-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0302: test credential-store support for XDG_CONFIG_HOMEPaul Tan2015-03-241-0/+114
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-credential-store: support XDG_CONFIG_HOMEPaul Tan2015-03-242-6/+42
| * | | | | | | | | | | | | | | | | | | | | | | | | | | git-credential-store: support multiple credential filesPaul Tan2015-03-241-25/+56
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.4.2v2.4.2Junio C Hamano2015-05-264-3/+49
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/still-interesting' into maintJunio C Hamano2015-05-261-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | limit_list: avoid quadratic behavior from still_interestingJeff King2015-04-171-4/+19
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/hash-object' into maintJunio C Hamano2015-05-265-9/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | write_sha1_file(): do not use a separate sha1[] arrayjc/hash-objectJunio C Hamano2015-05-051-4/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t1007: add hash-object --literally testsEric Sunshine2015-05-051-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | hash-object --literally: fix buffer overrun with extra-long object typeEric Sunshine2015-05-053-3/+23
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-hash-object.txt: document --literally optionEric Sunshine2015-05-041-2/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-quiet-noop' into maintJunio C Hamano2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: silence "git checkout" for noop rebasejk/rebase-quiet-noopJeff King2015-04-281-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/complete-decorate-full-not-long' into maintJunio C Hamano2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: fix and update 'git log --decorate=' optionssg/complete-decorate-full-not-longSZEDER Gábor2015-05-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-05-262-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter-branch: avoid passing commit message through sedJeff King2015-04-292-1/+19
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maintJunio C Hamano2015-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daemon: unbreak NO_IPV6 build regressionjc/daemon-no-ipv6-for-2.4.1Junio C Hamano2015-05-051-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2015-05-262-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stash: require a clean index to applyJeff King2015-04-222-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3903: avoid applying onto dirty indexJeff King2015-04-221-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3903: stop hard-coding commit sha1sJeff King2015-04-221-5/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/git-no-more-argv0-path-munging' into maintJunio C Hamano2015-05-261-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop putting argv[0] dirname at front of PATHjk/git-no-more-argv0-path-mungingJeff King2015-04-221-1/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /