Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | index-pack: skip collision check when not in repositoryjk/index-pack-wo-repo-from-stdin | Jeff King | 2016-12-16 | 1 | -4/+6 | |
| * | | | | | | | | | | | | | | t: use nongit() function where applicable | Jeff King | 2016-12-16 | 3 | -29/+5 | |
| * | | | | | | | | | | | | | | index-pack: complain when --stdin is used outside of a repo | Jeff King | 2016-12-16 | 2 | -0/+17 | |
| * | | | | | | | | | | | | | | t5000: extract nongit function to test-lib-functions.sh | Jeff King | 2016-12-16 | 2 | -14/+14 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/parseopt-usage-msg-opt' into maint | Junio C Hamano | 2017-01-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | parse-options: print "fatal:" before usage_msg_opt()jk/parseopt-usage-msg-opt | Jeff King | 2016-12-14 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/quote-env-path-list-component' into maint | Junio C Hamano | 2017-01-17 | 5 | -12/+102 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on Windows | Johannes Sixt | 2016-12-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, too | Johannes Sixt | 2016-12-13 | 1 | -4/+10 | |
| * | | | | | | | | | | | | | | tmp-objdir: quote paths we add to alternates | Jeff King | 2016-12-12 | 2 | -1/+36 | |
| * | | | | | | | | | | | | | | alternates: accept double-quoted paths | Jeff King | 2016-12-12 | 3 | -11/+60 | |
| * | | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component | Junio C Hamano | 2016-12-12 | 2 | -1/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/shallow-fixup' into maint | Junio C Hamano | 2017-01-17 | 1 | -19/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | shallow.c: remove useless codend/shallow-fixup | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -4/+0 | |
| * | | | | | | | | | | | | | | | | shallow.c: bit manipulation tweaks | Rasmus Villemoes | 2016-12-07 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | shallow.c: avoid theoretical pointer wrap-around | Rasmus Villemoes | 2016-12-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | shallow.c: make paint_alloc slightly more robust | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | | shallow.c: rename fields in paint_info to better express their purposes | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -9/+9 | |
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'sb/sequencer-abort-safety' into maint | Junio C Hamano | 2017-01-17 | 3 | -2/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Revert "sequencer: remove useless get_dir() function"sb/sequencer-abort-safety | Junio C Hamano | 2016-12-14 | 1 | -1/+6 | |
| * | | | | | | | | | | | | | | | | sequencer: remove useless get_dir() function | Stephan Beyer | 2016-12-09 | 1 | -6/+1 | |
| * | | | | | | | | | | | | | | | | sequencer: make sequencer abort safer | Stephan Beyer | 2016-12-09 | 2 | -1/+50 | |
| * | | | | | | | | | | | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEAD | Stephan Beyer | 2016-12-09 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-xxdiff-hotkey' into maint | Junio C Hamano | 2017-01-17 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkey | David Aguilar | 2016-12-11 | 1 | -5/+5 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' into maint | Junio C Hamano | 2017-01-17 | 2 | -4/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ff | Junio C Hamano | 2016-11-29 | 2 | -4/+35 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/normalize-path-copy-ceil' into maint | Junio C Hamano | 2017-01-17 | 1 | -9/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | normalize_path_copy(): fix pushing to //server/share/dir on Windowsjs/normalize-path-copy-ceil | Johannes Sixt | 2016-12-16 | 1 | -9/+14 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 | 3 | -4/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | commit: remove 'Clever' message for --only --amendak/commit-only-allow-empty | Andreas Krey | 2016-12-09 | 1 | -2/+0 | |
| * | | | | | | | | | | | | | | | | | | | commit: make --only --allow-empty work without paths | Andreas Krey | 2016-12-05 | 3 | -2/+12 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool-dir-diff-fix' into maint | Junio C Hamano | 2017-01-17 | 2 | -3/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | difftool: fix dir-diff index creation when in a subdirectoryda/difftool-dir-diff-fix | David Aguilar | 2016-12-08 | 2 | -3/+45 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jb/diff-no-index-no-abbrev' into maint | Junio C Hamano | 2017-01-17 | 8 | -1/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | diff: handle --no-abbrev in no-index casejb/diff-no-index-no-abbrev | Jack Bates | 2016-12-08 | 8 | -1/+39 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/stash-disable-renames-internally' into maint | Junio C Hamano | 2017-01-17 | 2 | -1/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | stash: prefer plumbing over git-diffjk/stash-disable-renames-internally | Jeff King | 2016-12-06 | 2 | -1/+10 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/http-walker-limit-redirect' into maint | Junio C Hamano | 2017-01-17 | 9 | -28/+165 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | http-walker: complain about non-404 loose object errorsjk/http-walker-limit-redirect | Jeff King | 2016-12-06 | 2 | -3/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/http-walker' into jk/http-walker-limit-redirect | Junio C Hamano | 2016-12-06 | 3 | -31/+206 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | http: treat http-alternates like redirectsjk/http-walker-limit-redirect-2.9 | Jeff King | 2016-12-06 | 3 | -3/+44 | |
| * | | | | | | | | | | | | | | | | | | | | | | http: make redirects more obvious | Jeff King | 2016-12-06 | 6 | -3/+81 | |
| * | | | | | | | | | | | | | | | | | | | | | | remote-curl: rename shadowed options variable | Jeff King | 2016-12-06 | 1 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | http: always update the base URL for redirects | Jeff King | 2016-12-06 | 4 | -4/+21 | |
| * | | | | | | | | | | | | | | | | | | | | | | http: simplify update_url_from_redirect | Jeff King | 2016-12-06 | 1 | -6/+4 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maint | Junio C Hamano | 2017-01-17 | 3 | -6/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |