summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ls/travis-p4-on-macos'Junio C Hamano2017-01-311-10/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | travis-ci: fix Perforce install on macOSls/travis-p4-on-macosLars Schneider2017-01-231-10/+2
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'vp/show-ref-verify-head'Junio C Hamano2017-01-312-28/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | show-ref: remove a stale commentvp/show-ref-verify-headJunio C Hamano2017-01-231-4/+0
| * | | | | | | | | | | | | | | | | | | | | | | | show-ref: remove dead `if (verify)' checkVladimir Panteleev2017-01-231-3/+0
| * | | | | | | | | | | | | | | | | | | | | | | | show-ref: detect dangling refs under --verify as wellVladimir Panteleev2017-01-232-8/+30
| * | | | | | | | | | | | | | | | | | | | | | | | show-ref: move --quiet handling into show_one()Vladimir Panteleev2017-01-231-5/+4
| * | | | | | | | | | | | | | | | | | | | | | | | show-ref: allow -d to work with --verifyVladimir Panteleev2017-01-232-11/+21
| * | | | | | | | | | | | | | | | | | | | | | | | show-ref: accept HEAD with --verifyVladimir Panteleev2017-01-232-1/+12
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/retire-convert-objects-from-contrib'Junio C Hamano2017-01-312-358/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | contrib: remove git-convert-objectssb/retire-convert-objects-from-contribStefan Beller2017-01-192-358/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/in-core-index-doc'Junio C Hamano2017-01-313-22/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | documentation: retire unfinished documentationsb/in-core-index-docStefan Beller2017-01-191-21/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | cache.h: document add_[file_]to_indexStefan Beller2017-01-191-0/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | cache.h: document remove_index_entry_atStefan Beller2017-01-192-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | cache.h: document index_name_posStefan Beller2017-01-191-0/+19
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/remote-rename-with-half-configured-remote'Junio C Hamano2017-01-315-12/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | remote rename: more carefully determine whether a remote is configuredjs/remote-rename-with-half-configured-remoteJohannes Schindelin2017-01-195-13/+21
| * | | | | | | | | | | | | | | | | | | | | | | | | remote rename: demonstrate a bogus "remote exists" bugJohannes Schindelin2017-01-191-0/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/clear-delta-base-cache-fix'Junio C Hamano2017-01-312-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | clear_delta_base_cache(): don't modify hashmap while iteratingjk/clear-delta-base-cache-fixJeff King2017-01-192-6/+7
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'st/verify-tag'Junio C Hamano2017-01-3110-24/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t/t7004-tag: Add --format specifier testsSantiago Torres2017-01-181-0/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | t/t7030-verify-tag: Add --format specifier testsSantiago Torres2017-01-181-0/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/tag: add --format argument for tag -vLukas Puehringer2017-01-182-11/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | builtin/verify-tag: add --format to verify-tagSantiago Torres2017-01-172-4/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | ref-filter: add function to print single ref_array_itemLukas Puehringer2017-01-172-6/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | gpg-interface, tag: add GPG_VERIFY_OMIT_STATUS flagLukas Puehringer2017-01-172-3/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-isatty'Junio C Hamano2017-01-311-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | mingw: follow-up to "replace isatty() hack"Johannes Schindelin2017-01-181-7/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/sequencer-i-countdown-3'Junio C Hamano2017-01-313-97/+1030
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): write out the final messagejs/sequencer-i-countdown-3Johannes Schindelin2017-01-171-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): write the progress into filesJohannes Schindelin2017-01-171-3/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): show the progressJohannes Schindelin2017-01-171-0/+32
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): suggest --edit-todo upon unknown commandJohannes Schindelin2017-01-171-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): show only failed cherry-picks' outputJohannes Schindelin2017-01-171-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): show only failed `git commit`'s outputJohannes Schindelin2017-01-171-0/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: use run_command() directlyJohannes Schindelin2017-01-171-20/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer: update reading author-scriptJohannes Schindelin2017-01-172-22/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): differentiate between comments and 'noop'Johannes Schindelin2017-01-091-6/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): implement the 'drop' commandJohannes Schindelin2017-01-091-3/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): allow rescheduling commandsJohannes Schindelin2017-01-091-0/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): respect strategy/strategy_opts settingsJohannes Schindelin2017-01-091-1/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): respect the rebase.autostash settingJohannes Schindelin2017-01-091-0/+43
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): run the post-rewrite hook, if neededJohannes Schindelin2017-01-091-0/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): record interrupted commits in rewritten, tooJohannes Schindelin2017-01-091-0/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): copy commit notes at endJohannes Schindelin2017-01-091-0/+76
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): set the reflog message consistentlyJohannes Schindelin2017-01-091-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): refactor setting the reflog messageJohannes Schindelin2017-01-091-7/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | | sequencer (rebase -i): allow fast-forwarding for edit/rewordJohannes Schindelin2017-01-091-8/+17