summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'va/i18n'Junio C Hamano2016-10-266-50/+60
|\
| * i18n: diff: mark warnings for translationva/i18nVasco Almeida2016-10-171-7/+7
| * i18n: credential-cache--daemon: mark advice for translationVasco Almeida2016-10-171-3/+3
| * i18n: convert mark error messages for translationVasco Almeida2016-10-172-5/+13
| * i18n: apply: mark error message for translationVasco Almeida2016-10-172-3/+3
| * i18n: apply: mark error messages for translationVasco Almeida2016-10-141-24/+24
| * i18n: apply: mark info messages for translationVasco Almeida2016-10-141-4/+4
| * i18n: apply: mark plural string for translationVasco Almeida2016-10-141-4/+6
* | Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano2016-10-264-4/+112
|\ \
| * | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-144-4/+112
* | | Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2016-10-262-0/+9
|\ \ \
| * | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflogJeff King2016-10-122-0/+9
* | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-261-1/+1
|\ \ \ \
| * | | | t1512: become resilient to GETTEXT_POISON buildjk/ambiguous-short-object-namesVasco Almeida2016-10-121-1/+1
* | | | | Merge branch 'jk/upload-pack-use-prio-queue'Junio C Hamano2016-10-261-6/+7
|\ \ \ \ \
| * | | | | upload-pack: use priority queue in reachable() checkjk/upload-pack-use-prio-queueJeff King2016-10-111-6/+7
* | | | | | Merge branch 'ab/gitweb-abbrev-links'Junio C Hamano2016-10-261-3/+17
|\ \ \ \ \ \
| * | | | | | gitweb: link to "git describe"'d commits in log messagesab/gitweb-abbrev-linksÆvar Arnfjörð Bjarmason2016-10-141-2/+16
| * | | | | | gitweb: link to 7-char+ SHA-1s, not only 8-char+Ævar Arnfjörð Bjarmason2016-10-141-1/+1
| * | | | | | gitweb: fix a typo in a commentÆvar Arnfjörð Bjarmason2016-10-141-1/+1
* | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'Junio C Hamano2016-10-262-0/+10
|\ \ \ \ \ \ \
| * | | | | | | worktree: allow the main brach of a bare repository to be checked outdk/worktree-dup-checkout-with-bare-is-okDennis Kaarsemaker2016-10-142-0/+10
* | | | | | | | Merge branch 'mg/gpg-richer-status'Junio C Hamano2016-10-264-6/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | gpg-interface: use more status lettersmg/gpg-richer-statusMichael J Gruber2016-10-124-6/+34
* | | | | | | | | Merge branch 'jc/cocci-xstrdup-or-null'Junio C Hamano2016-10-267-20/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-nullJunio C Hamano2016-10-127-20/+17
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mm/credential-libsecret'Junio C Hamano2016-10-262-0/+395
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | contrib: add credential helper for libsecretmm/credential-libsecretMantas Mikulėnas2016-10-112-0/+395
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano2016-10-269-44/+452
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-files: add pathspec matching for submodulesbw/ls-files-recurse-submodulesBrandon Williams2016-10-105-13/+175
| * | | | | | | | | ls-files: pass through safe options for --recurse-submodulesBrandon Williams2016-10-102-7/+39
| * | | | | | | | | ls-files: optionally recurse into submodulesBrandon Williams2016-10-104-40/+208
| * | | | | | | | | git: make super-prefix optionBrandon Williams2016-10-104-0/+46
* | | | | | | | | | Merge branch 'js/libify-require-clean-work-tree'Junio C Hamano2016-10-263-68/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
* | | | | | | | | | | Merge branch 'jc/ws-error-highlight'Junio C Hamano2016-10-264-52/+119
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlightJunio C Hamano2016-10-044-1/+53
| * | | | | | | | | | | diff.c: move ws-error-highlight parsing helpers upJunio C Hamano2016-10-041-37/+37
| * | | | | | | | | | | diff.c: refactor parse_ws_error_highlight()Junio C Hamano2016-10-041-5/+16
| * | | | | | | | | | | t4015: split out the "setup" part of ws-error-highlight testJunio C Hamano2016-10-041-18/+21
* | | | | | | | | | | | Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano2016-10-261-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff_unique_abbrev(): document its assumption and limitationjc/diff-unique-abbrev-commentsJunio C Hamano2016-09-301-1/+22
* | | | | | | | | | | | | Sync with maintJunio C Hamano2016-10-172-2417/+2813
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-10-172-2417/+2813
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-10-161-26/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \