Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'va/i18n' | Junio C Hamano | 2016-10-26 | 6 | -50/+60 |
|\ | |||||
| * | i18n: diff: mark warnings for translationva/i18n | Vasco Almeida | 2016-10-17 | 1 | -7/+7 |
| * | i18n: credential-cache--daemon: mark advice for translation | Vasco Almeida | 2016-10-17 | 1 | -3/+3 |
| * | i18n: convert mark error messages for translation | Vasco Almeida | 2016-10-17 | 2 | -5/+13 |
| * | i18n: apply: mark error message for translation | Vasco Almeida | 2016-10-17 | 2 | -3/+3 |
| * | i18n: apply: mark error messages for translation | Vasco Almeida | 2016-10-14 | 1 | -24/+24 |
| * | i18n: apply: mark info messages for translation | Vasco Almeida | 2016-10-14 | 1 | -4/+4 |
| * | i18n: apply: mark plural string for translation | Vasco Almeida | 2016-10-14 | 1 | -4/+6 |
* | | Merge branch 'jk/fetch-quick-tag-following' | Junio C Hamano | 2016-10-26 | 4 | -4/+112 |
|\ \ | |||||
| * | | fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-following | Jeff King | 2016-10-14 | 4 | -4/+112 |
* | | | Merge branch 'jk/merge-base-fork-point-without-reflog' | Junio C Hamano | 2016-10-26 | 2 | -0/+9 |
|\ \ \ | |||||
| * | | | merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflog | Jeff King | 2016-10-12 | 2 | -0/+9 |
* | | | | Merge branch 'jk/ambiguous-short-object-names' | Junio C Hamano | 2016-10-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | t1512: become resilient to GETTEXT_POISON buildjk/ambiguous-short-object-names | Vasco Almeida | 2016-10-12 | 1 | -1/+1 |
* | | | | | Merge branch 'jk/upload-pack-use-prio-queue' | Junio C Hamano | 2016-10-26 | 1 | -6/+7 |
|\ \ \ \ \ | |||||
| * | | | | | upload-pack: use priority queue in reachable() checkjk/upload-pack-use-prio-queue | Jeff King | 2016-10-11 | 1 | -6/+7 |
* | | | | | | Merge branch 'ab/gitweb-abbrev-links' | Junio C Hamano | 2016-10-26 | 1 | -3/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: link to "git describe"'d commits in log messagesab/gitweb-abbrev-links | Ævar Arnfjörð Bjarmason | 2016-10-14 | 1 | -2/+16 |
| * | | | | | | gitweb: link to 7-char+ SHA-1s, not only 8-char+ | Ævar Arnfjörð Bjarmason | 2016-10-14 | 1 | -1/+1 |
| * | | | | | | gitweb: fix a typo in a comment | Ævar Arnfjörð Bjarmason | 2016-10-14 | 1 | -1/+1 |
* | | | | | | | Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' | Junio C Hamano | 2016-10-26 | 2 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | worktree: allow the main brach of a bare repository to be checked outdk/worktree-dup-checkout-with-bare-is-ok | Dennis Kaarsemaker | 2016-10-14 | 2 | -0/+10 |
* | | | | | | | | Merge branch 'mg/gpg-richer-status' | Junio C Hamano | 2016-10-26 | 4 | -6/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gpg-interface: use more status lettersmg/gpg-richer-status | Michael J Gruber | 2016-10-12 | 4 | -6/+34 |
* | | | | | | | | | Merge branch 'jc/cocci-xstrdup-or-null' | Junio C Hamano | 2016-10-26 | 7 | -20/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | cocci: refactor common patterns to use xstrdup_or_null()jc/cocci-xstrdup-or-null | Junio C Hamano | 2016-10-12 | 7 | -20/+17 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mm/credential-libsecret' | Junio C Hamano | 2016-10-26 | 2 | -0/+395 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | contrib: add credential helper for libsecretmm/credential-libsecret | Mantas Mikulėnas | 2016-10-11 | 2 | -0/+395 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules' | Junio C Hamano | 2016-10-26 | 9 | -44/+452 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ls-files: add pathspec matching for submodulesbw/ls-files-recurse-submodules | Brandon Williams | 2016-10-10 | 5 | -13/+175 |
| * | | | | | | | | | ls-files: pass through safe options for --recurse-submodules | Brandon Williams | 2016-10-10 | 2 | -7/+39 |
| * | | | | | | | | | ls-files: optionally recurse into submodules | Brandon Williams | 2016-10-10 | 4 | -40/+208 |
| * | | | | | | | | | git: make super-prefix option | Brandon Williams | 2016-10-10 | 4 | -0/+46 |
* | | | | | | | | | | Merge branch 'js/libify-require-clean-work-tree' | Junio C Hamano | 2016-10-26 | 3 | -68/+87 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | wt-status: begin error messages with lower-casejs/libify-require-clean-work-tree | Johannes Schindelin | 2016-10-07 | 1 | -3/+3 |
| * | | | | | | | | | | wt-status: teach has_{unstaged,uncommitted}_changes() about submodules | Johannes Schindelin | 2016-10-07 | 3 | -11/+14 |
| * | | | | | | | | | | wt-status: export also the has_un{staged,committed}_changes() functions | Johannes Schindelin | 2016-10-07 | 2 | -3/+5 |
| * | | | | | | | | | | wt-status: make the require_clean_work_tree() function reusable | Johannes Schindelin | 2016-10-07 | 3 | -76/+80 |
| * | | | | | | | | | | pull: make code more similar to the shell script again | Johannes Schindelin | 2016-10-07 | 1 | -10/+20 |
| * | | | | | | | | | | pull: drop confusing prefix parameter of die_on_unclean_work_tree() | Johannes Schindelin | 2016-10-07 | 1 | -8/+8 |
* | | | | | | | | | | | Merge branch 'jc/ws-error-highlight' | Junio C Hamano | 2016-10-26 | 4 | -52/+119 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | diff: introduce diff.wsErrorHighlight optionjc/ws-error-highlight | Junio C Hamano | 2016-10-04 | 4 | -1/+53 |
| * | | | | | | | | | | | diff.c: move ws-error-highlight parsing helpers up | Junio C Hamano | 2016-10-04 | 1 | -37/+37 |
| * | | | | | | | | | | | diff.c: refactor parse_ws_error_highlight() | Junio C Hamano | 2016-10-04 | 1 | -5/+16 |
| * | | | | | | | | | | | t4015: split out the "setup" part of ws-error-highlight test | Junio C Hamano | 2016-10-04 | 1 | -18/+21 |
* | | | | | | | | | | | | Merge branch 'jc/diff-unique-abbrev-comments' | Junio C Hamano | 2016-10-26 | 1 | -1/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | diff_unique_abbrev(): document its assumption and limitationjc/diff-unique-abbrev-comments | Junio C Hamano | 2016-09-30 | 1 | -1/+22 |
* | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-10-17 | 2 | -2417/+2813 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2016-10-17 | 2 | -2417/+2813 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2016-10-16 | 1 | -26/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |