aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* sequencer: reschedule pick if index can't be lockedPhillip Wood2017-11-16
* Start preparation for 2.15.1Junio C Hamano2017-11-15
* Merge branch 'ks/mailmap' into maintJunio C Hamano2017-11-15
|\
| * mailmap: use Kaartic Sivaraam's new addressKaartic Sivaraam2017-11-03
* | Merge branch 'jm/relnotes-2.15-typofix' into maintJunio C Hamano2017-11-15
|\ \
| * | fix typos in 2.15.0 release notesJean Carlo Machado2017-11-06
| |/
* | Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano2017-11-15
|\ \
| * | diff: --indent-heuristic is no longer experimentalCarlos Martín Nieto2017-11-02
* | | Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-15
|\ \ \
| * | | mingw: document the standard handle redirectionJohannes Schindelin2017-11-02
| * | | mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2017-11-02
| * | | mingw: add experimental feature to redirect standard handlesJohannes Schindelin2017-11-02
| | |/ | |/|
* | | Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2017-11-15
|\ \ \
| * | | wincred: handle empty username/password correctlyJakub Bereżański2017-11-01
| * | | t0302: check helper can handle empty credentialsJakub Bereżański2017-11-01
| |/ /
* | | Merge branch 'js/mingw-full-version-in-resources' into maintJunio C Hamano2017-11-15
|\ \ \
| * | | mingw: include the full version information in the resourcesJohannes Schindelin2017-11-01
| | |/ | |/|
* | | Merge branch 'dk/libsecret-unlock-to-load-fix' into maintJunio C Hamano2017-11-15
|\ \ \
| * | | credential-libsecret: unlock locked secretsDennis Kaarsemaker2017-11-04
* | | | Merge branch 'js/early-config' into maintJunio C Hamano2017-11-15
|\ \ \ \
| * | | | setup: avoid double slashes when looking for HEADJeff King2017-11-03
* | | | | Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano2017-11-15
|\ \ \ \ \
| * | | | | t5580: add Cygwin supportAdam Dinwoodie2017-11-01
| | |_|/ / | |/| | |
* | | | | Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maintJunio C Hamano2017-11-15
|\ \ \ \ \
| * | | | | diff: fix lstat() error handling in diff_populate_filespec()Andrey Okoshkin2017-10-29
* | | | | | Merge branch 'sb/blame-config-doc' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \
| * | | | | | config: document blame configurationStefan Beller2017-11-06
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/complete-checkout' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \
| * | | | | | completion: add remaining flags to checkoutThomas Braun2017-10-25
* | | | | | | Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \
| * | | | | | | check-ref-format doc: --branch validates and expands <branch>Junio C Hamano2017-10-18
| * | | | | | | check-ref-format --branch: strip refs/heads/ using skip_prefixJunio C Hamano2017-10-18
| * | | | | | | check-ref-format --branch: do not expand @{...} outside repositoryJunio C Hamano2017-10-18
* | | | | | | | Merge branch 'jc/t5601-copy-workaround' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \
| * | | | | | | | t5601: rm the target file of cp that could still be executingJunio C Hamano2017-10-17
* | | | | | | | | Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sequencer: pass absolute GIT_DIR to exec commandsJacob Keller2017-11-02
* | | | | | | | | | Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: take the read-lock when adding a submoduleMartin Ågren2017-11-02
* | | | | | | | | | | Merge branch 'js/submodule-in-excluded' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status: do not get confused by submodules in excluded directoriesJohannes Schindelin2017-10-26
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: check result of resolve_ref_unsafeAndrey Okoshkin2017-10-21
* | | | | | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree: handle broken symrefs in find_shared_symref()Jeff King2017-10-21
| * | | | | | | | | | | | log: handle broken HEAD in decoration checkJeff King2017-10-21
| * | | | | | | | | | | | remote: handle broken symrefsJeff King2017-10-21
| * | | | | | | | | | | | test-ref-store: avoid passing NULL to printfJeff King2017-10-21
* | | | | | | | | | | | | Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | diff.c: get rid of duplicate implementationStefan Beller2017-10-26