summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* difftool: fix use-after-freejs/difftool-builtinJohannes Schindelin2017-04-131-2/+5
* difftool: avoid strcpyJeff King2017-03-301-16/+15
* difftool: handle modified symlinks in dir-diff modeDavid Aguilar2017-03-151-5/+46
* difftool: fix bug when printing usageDavid Aguilar2017-02-061-4/+4
* difftool: hack around -Wzero-length-format warningJeff King2017-01-251-1/+1
* difftool: retire the scripted versionJohannes Schindelin2017-01-191-41/+0
* difftool: implement the functionality in the builtinJohannes Schindelin2017-01-191-1/+671
* difftool: add a skeleton for the upcoming builtinJohannes Schindelin2017-01-171-0/+63
* Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-233-8/+19
|\
| * archive: read local configurationjc/setup-cleanup-fixJunio C Hamano2016-11-222-4/+4
| * mailinfo: read local configurationJunio C Hamano2016-11-221-4/+15
* | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-231-1/+3
|\ \ | |/ |/|
| * stripspace: respect repository configJohannes Schindelin2016-11-211-1/+3
* | Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-172-3/+3
|\ \
| * | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-092-3/+3
* | | Merge branch 'rs/commit-pptr-simplify'Junio C Hamano2016-10-311-8/+6
|\ \ \
| * | | commit: simplify building parents listrs/commit-pptr-simplifyRené Scharfe2016-10-301-8/+6
| | |/ | |/|
* | | Merge branch 'ls/filter-process'Junio C Hamano2016-10-314-8/+8
|\ \ \
| * | | pkt-line: rename packet_write() to packet_write_fmt()Lars Schneider2016-10-174-8/+8
* | | | Merge branch 'ls/git-open-cloexec'Junio C Hamano2016-10-311-1/+1
|\ \ \ \
| * | | | sha1_file: rename git_open_noatime() to git_open()Lars Schneider2016-10-251-1/+1
* | | | | Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-4/+9
|\ \ \ \ \
| * | | | | commit: don't be fooled by ita entries when creating initial commitnd/ita-empty-commitNguyễn Thái Ngọc Duy2016-10-241-3/+8
| * | | | | commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-241-1/+1
* | | | | | Merge branch 'js/prepare-sequencer'Junio C Hamano2016-10-272-25/+23
|\ \ \ \ \ \
| * | | | | | sequencer: get rid of the subcommand fieldJohannes Schindelin2016-10-211-20/+16
| * | | | | | sequencer: plug memory leaks for the option valuesJohannes Schindelin2016-10-211-0/+4
| * | | | | | sequencer: use memoized sequencer directory pathJohannes Schindelin2016-10-171-1/+1
| * | | | | | sequencer: use static initializers for replay_optsJohannes Schindelin2016-10-171-4/+2
* | | | | | | Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-271-2/+6
|\ \ \ \ \ \ \
| * | | | | | | submodule: ignore trailing slash in relative urlStefan Beller2016-10-101-0/+2
| * | | | | | | submodule: ignore trailing slash on superproject URLStefan Beller2016-10-101-2/+4
* | | | | | | | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-272-16/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | find_unique_abbrev: use 4-buffer ringJeff King2016-10-262-16/+11
* | | | | | | | | Merge branch 'jc/abbrev-auto'Junio C Hamano2016-10-271-16/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | transport: allow summary-width to be computed dynamicallyJunio C Hamano2016-10-211-2/+2
| * | | | | | | | | fetch: pass summary_width down the callchainJunio C Hamano2016-10-211-16/+21
* | | | | | | | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-272-2/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | abbrev: prepare for new world orderJunio C Hamano2016-10-031-2/+3
| * | | | | | | | abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizingJunio C Hamano2016-10-031-0/+3
* | | | | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-10-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rev-list: use hdr_termination instead of a always using a newlineJacob Keller2016-10-201-1/+1
* | | | | | | | | | Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano2016-10-261-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-141-4/+7
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-081-3/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/use-strbuf-add-unique-abbrev' 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 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-081-7/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-081-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-081-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status