aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| * | | | | | | | | | xdiff-interface: export comparing and hashing stringsStefan Beller2017-10-26
* | | | | | | | | | | Merge branch 'jk/diff-color-moved-fix' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | diff: handle NULs in get_string_hash()Jeff King2017-10-21
| * | | | | | | | | | diff: fix whitespace-skipping with --color-movedJeff King2017-10-21
| * | | | | | | | | | t4015: test the output of "diff --color-moved -b"Jeff King2017-10-21
| * | | | | | | | | | t4015: check "negative" case for "-w --color-moved"Jeff King2017-10-21
| * | | | | | | | | | t4015: refactor --color-moved whitespace testJeff King2017-10-21
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'kd/auto-col-with-pager-fix' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | column: do not include pager.cJunio C Hamano2017-10-24
| * | | | | | | | | | column: show auto columns when pager is activeKevin Daudt2017-10-17
* | | | | | | | | | | Merge branch 'sg/travis-fixes' into maintJunio C Hamano2017-11-15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | travis-ci: don't build Git for the static analysis jobSZEDER Gábor2017-11-02
| * | | | | | | | | | | travis-ci: fix running P4 and Git LFS tests in Linux build jobsSZEDER Gábor2017-11-02
* | | | | | | | | | | | Git 2.15Junio C Hamano2017-10-30
* | | | | | | | | | | | Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-poJunio C Hamano2017-10-30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | l10n: Update Catalan translationJordi Mas2017-10-29
* | | | | | | | | | | | | Hopefully final batch before 2.15Junio C Hamano2017-10-28
* | | | | | | | | | | | | Merge branch 'sg/rev-list-doc-reorder-fix'Junio C Hamano2017-10-28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rev-list-options.txt: use correct directional referenceSZEDER Gábor2017-10-27
* | | | | | | | | | | | | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-10-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | docs: fix formatting of rev-parse's --show-superproject-working-treeSebastian Schuberth2017-10-27
* | | | | | | | | | | | | | | Merge branch 'ao/path-use-xmalloc'Junio C Hamano2017-10-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | path.c: use xmalloc() in add_to_trie()Andrey Okoshkin2017-10-25
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |