summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wt-status: begin error messages with lower-casejs/libify-require-clean-work-treeJohannes Schindelin2016-10-071-3/+3
* wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin2016-10-073-11/+14
* wt-status: export also the has_un{staged,committed}_changes() functionsJohannes Schindelin2016-10-072-3/+5
* wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin2016-10-073-76/+80
* pull: make code more similar to the shell script againJohannes Schindelin2016-10-071-10/+20
* pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin2016-10-071-8/+8
* Sync with maintJunio C Hamano2016-09-081-0/+83
|\
| * Start maintenance track for 2.10.x seriesJunio C Hamano2016-09-08303-18845/+35770
| |\
| * | Prepare for 2.9.4Junio C Hamano2016-09-082-1/+84
| * | Merge branch 'hv/doc-commit-reference-style' into maintJunio C Hamano2016-09-081-0/+10
| |\ \
| * \ \ Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-09-081-1/+0
| |\ \ \
| * \ \ \ Merge branch 'rs/mailinfo-lib' into maintJunio C Hamano2016-09-081-7/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-082-4/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-083-16/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/merge-recursive-string-list-init' into maintJunio C Hamano2016-09-081-2/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-081-34/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ls/packet-line-protocol-doc-fix' into maintJunio C Hamano2016-09-081-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maintJunio C Hamano2016-09-086-1/+35
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'dg/document-git-c-in-git-config-doc' into maintJunio C Hamano2016-09-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-083-52/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/difftool-command-not-found' into maintJunio C Hamano2016-09-082-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-082-1/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pull-signed-tag' into maintJunio C Hamano2016-09-084-12/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/test-lint-pathname' into maintJunio C Hamano2016-09-081-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-081-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/import-tars-hardlinks' into maintJunio C Hamano2016-09-081-11/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/document-pack-window-memory-is-per-thread' into maintJunio C Hamano2016-09-082-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-084-7/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-086-10/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-0810-90/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/common-main' into maintJunio C Hamano2016-09-0853-153/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | Start the 2.11 cycleJunio C Hamano2016-09-083-2/+58
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bh/diff-highlight-graph'Junio C Hamano2016-09-085-6/+338
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: avoid highlighting combined diffsbh/diff-highlight-graphJeff King2016-08-312-1/+38
| * | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add multi-byte testsJeff King2016-08-311-1/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: ignore test cruftJeff King2016-08-311-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add support for --graph outputBrian Henderson2016-08-292-7/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add failing test for handling --graph outputBrian Henderson2016-08-291-0/+62
| * | | | | | | | | | | | | | | | | | | | | | | | | diff-highlight: add some testsBrian Henderson2016-08-293-0/+190
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hv/doc-commit-reference-style'Junio C Hamano2016-09-081-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | SubmittingPatches: use gitk's "Copy commit summary" formathv/doc-commit-reference-styleBeat Bolli2016-08-261-3/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-088-121/+379
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: recursive and reference option triggers submodule alternatessb/submodule-clone-rrStefan Beller2016-08-174-0/+176
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: implement optional referencesStefan Beller2016-08-152-11/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: clarify option_reference as requiredStefan Beller2016-08-151-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: factor out checking for an alternate pathStefan Beller2016-08-153-34/+86
| * | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper update-clone: allow multiple referencesStefan Beller2016-08-122-6/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | submodule--helper module-clone: allow multiple referencesStefan Beller2016-08-121-8/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7408: merge short tests, factor out testing methodStefan Beller2016-08-121-23/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7408: modernize styleStefan Beller2016-08-121-69/+71
View Lorry Controller Status