summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* launch_editor(): indicate that Git waits for user inputls/editor-waiting-messageLars Schneider2017-12-074-0/+30
* refactor "dumb" terminal determinationLars Schneider2017-12-044-7/+11
* Start preparation for 2.15.1Junio C Hamano2017-11-153-2/+70
* Merge branch 'ks/mailmap' into maintJunio C Hamano2017-11-151-0/+1
|\
| * mailmap: use Kaartic Sivaraam's new addressks/mailmapKaartic Sivaraam2017-11-031-0/+1
* | Merge branch 'jm/relnotes-2.15-typofix' into maintJunio C Hamano2017-11-151-3/+3
|\ \
| * | fix typos in 2.15.0 release notesjm/relnotes-2.15-typofixJean Carlo Machado2017-11-061-3/+3
| |/
* | Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano2017-11-154-9/+6
|\ \
| * | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimentalCarlos Martín Nieto2017-11-024-9/+6
* | | Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-153-0/+88
|\ \ \
| * | | mingw: document the standard handle redirectionjs/mingw-redirect-std-handlesJohannes Schindelin2017-11-021-0/+18
| * | | mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2017-11-022-1/+22
| * | | mingw: add experimental feature to redirect standard handlesJohannes Schindelin2017-11-022-0/+49
| | |/ | |/|
* | | Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2017-11-152-2/+27
|\ \ \
| * | | wincred: handle empty username/password correctlyjs/wincred-empty-credJakub Bereżański2017-11-011-2/+8
| * | | t0302: check helper can handle empty credentialsJakub Bereżański2017-11-011-0/+19
| |/ /
* | | Merge branch 'js/mingw-full-version-in-resources' into maintJunio C Hamano2017-11-152-3/+4
|\ \ \
| * | | mingw: include the full version information in the resourcesjs/mingw-full-version-in-resourcesJohannes Schindelin2017-11-012-3/+4
| | |/ | |/|
* | | Merge branch 'dk/libsecret-unlock-to-load-fix' into maintJunio C Hamano2017-11-151-1/+1
|\ \ \
| * | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fixDennis Kaarsemaker2017-11-041-1/+1
* | | | Merge branch 'js/early-config' into maintJunio C Hamano2017-11-151-1/+3
|\ \ \ \
| * | | | setup: avoid double slashes when looking for HEADjs/early-configJeff King2017-11-031-1/+3
* | | | | Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano2017-11-151-4/+10
|\ \ \ \ \
| * | | | | t5580: add Cygwin supportad/5580-unc-tests-on-cygwinAdam Dinwoodie2017-11-011-4/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maintJunio C Hamano2017-11-151-8/+6
|\ \ \ \ \
| * | | | | diff: fix lstat() error handling in diff_populate_filespec()ao/diff-populate-filespec-lstat-errorpath-fixAndrey Okoshkin2017-10-291-8/+6
* | | | | | Merge branch 'sb/blame-config-doc' into maintJunio C Hamano2017-11-151-0/+17
|\ \ \ \ \ \
| * | | | | | config: document blame configurationsb/blame-config-docStefan Beller2017-11-061-0/+17
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/complete-checkout' into maintJunio C Hamano2017-11-152-1/+6
|\ \ \ \ \ \
| * | | | | | completion: add remaining flags to checkouttb/complete-checkoutThomas Braun2017-10-252-1/+6
* | | | | | | Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-154-4/+32
|\ \ \ \ \ \ \
| * | | | | | | check-ref-format doc: --branch validates and expands <branch>jc/check-ref-format-oorJunio C Hamano2017-10-181-1/+8
| * | | | | | | check-ref-format --branch: strip refs/heads/ using skip_prefixJunio C Hamano2017-10-181-2/+4
| * | | | | | | check-ref-format --branch: do not expand @{...} outside repositoryJunio C Hamano2017-10-182-1/+20
* | | | | | | | Merge branch 'jc/t5601-copy-workaround' into maintJunio C Hamano2017-11-151-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | t5601: rm the target file of cp that could still be executingjc/t5601-copy-workaroundJunio C Hamano2017-10-171-0/+2
* | | | | | | | | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-152-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fixJacob Keller2017-11-022-1/+17
* | | | | | | | | | Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano2017-11-151-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: take the read-lock when adding a submodulebw/grep-recurse-submodulesMartin Ågren2017-11-021-0/+2
* | | | | | | | | | | Merge branch 'js/submodule-in-excluded' into maintJunio C Hamano2017-11-152-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excludedJohannes Schindelin2017-10-262-1/+12
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result' into maintJunio C Hamano2017-11-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-resultAndrey Okoshkin2017-10-211-0/+2
* | | | | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maintJunio C Hamano2017-11-154-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree: handle broken symrefs in find_shared_symref()jk/misc-resolve-ref-unsafe-fixesJeff King2017-10-211-1/+2
| * | | | | | | | | | | | log: handle broken HEAD in decoration checkJeff King2017-10-211-1/+1
| * | | | | | | | | | | | remote: handle broken symrefsJeff King2017-10-211-1/+1
| * | | | | | | | | | | | test-ref-store: avoid passing NULL to printfJeff King2017-10-211-1/+1
* | | | | | | | | | | | | Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maintJunio C Hamano2017-11-153-78/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status