aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-17
|\
| * git-p4: avoid crash adding symlinked directoryLuke Diamand2016-12-18
* | Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-17
|\ \
| * | push: test pushing ambiguously named branchesDennis Kaarsemaker2016-10-31
| * | push: do not use potentially ambiguous default refspecJunio C Hamano2016-10-28
* | | Merge branch 'jt/mailinfo-fold-in-body-headers' into maintJunio C Hamano2017-01-17
|\ \ \
| * | | mailinfo.c: move side-effects outside of assertKyle J. McKay2016-12-20
* | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-17
|\ \ \ \
| * | | | index-pack: skip collision check when not in repositoryJeff King2016-12-16
| * | | | t: use nongit() function where applicableJeff King2016-12-16
| * | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-16
| * | | | t5000: extract nongit function to test-lib-functions.shJeff King2016-12-16
| | |_|/ | |/| |
* | | | Merge branch 'jk/parseopt-usage-msg-opt' into maintJunio C Hamano2017-01-17
|\ \ \ \
| * | | | parse-options: print "fatal:" before usage_msg_opt()Jeff King2016-12-14
* | | | | Merge branch 'jk/quote-env-path-list-component' into maintJunio C Hamano2017-01-17
|\ \ \ \ \
| * | | | | t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt2016-12-21
| * | | | | t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt2016-12-13
| * | | | | tmp-objdir: quote paths we add to alternatesJeff King2016-12-12
| * | | | | alternates: accept double-quoted pathsJeff King2016-12-12
| * | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-componentJunio C Hamano2016-12-12
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'nd/shallow-fixup' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \
| * | | | | | | shallow.c: remove useless codeNguyễn Thái Ngọc Duy2016-12-07
| * | | | | | | shallow.c: bit manipulation tweaksRasmus Villemoes2016-12-07
| * | | | | | | shallow.c: avoid theoretical pointer wrap-aroundRasmus Villemoes2016-12-07
| * | | | | | | shallow.c: make paint_alloc slightly more robustNguyễn Thái Ngọc Duy2016-12-07
| * | | | | | | shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory poolsNguyễn Thái Ngọc Duy2016-12-07
| * | | | | | | shallow.c: rename fields in paint_info to better express their purposesNguyễn Thái Ngọc Duy2016-12-07
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \
| * | | | | | | Revert "sequencer: remove useless get_dir() function"Junio C Hamano2016-12-14
| * | | | | | | sequencer: remove useless get_dir() functionStephan Beyer2016-12-09
| * | | | | | | sequencer: make sequencer abort saferStephan Beyer2016-12-09
| * | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEADStephan Beyer2016-12-09
| * | | | | | | am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-08
| * | | | | | | am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-08
* | | | | | | | Merge branch 'da/mergetool-xxdiff-hotkey' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \
| * | | | | | | | mergetools: fix xxdiff hotkeysDavid Aguilar2016-12-11
* | | | | | | | | Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: fast-forward "pull --rebase=true"Junio C Hamano2016-11-29
* | | | | | | | | | Merge branch 'js/normalize-path-copy-ceil' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | normalize_path_copy(): fix pushing to //server/share/dir on WindowsJohannes Sixt2016-12-16
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: remove 'Clever' message for --only --amendAndreas Krey2016-12-09
| * | | | | | | | | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-05
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'da/difftool-dir-diff-fix' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar2016-12-08
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jb/diff-no-index-no-abbrev' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: handle --no-abbrev in no-index caseJack Bates2016-12-08
* | | | | | | | | | | Merge branch 'jk/stash-disable-renames-internally' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | stash: prefer plumbing over git-diffJeff King2016-12-06
* | | | | | | | | | | | Merge branch 'jk/http-walker-limit-redirect' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \