Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'jm/maint-strncpy-diff-no-index' | Junio C Hamano | 2012-04-26 | 1 | -21/+17 | |
|\ \ \ \ \ | ||||||
| * | | | | | diff --no-index: use strbuf for temporary pathnames | Junio C Hamano | 2012-04-26 | 1 | -23/+17 | |
| * | | | | | diff: avoid stack-buffer-read-overrun for very long name | Jim Meyering | 2012-04-16 | 1 | -0/+2 | |
| |/ / / / | ||||||
* | | | | | Merge bundle error message fix in | Junio C Hamano | 2012-04-26 | 6 | -4/+105 | |
|\ \ \ \ \ | ||||||
| * | | | | | Start preparing for 1.7.10.1 | Junio C Hamano | 2012-04-26 | 2 | -1/+51 | |
| * | | | | | Merge branch 'jk/run-command-eacces' into maint | Junio C Hamano | 2012-04-26 | 6 | -7/+86 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'jc/push-upstream-sanity' into maint | Junio C Hamano | 2012-04-26 | 2 | -8/+72 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maint | Junio C Hamano | 2012-04-26 | 2 | -11/+43 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/diff-no-rename-empty' into maint | Junio C Hamano | 2012-04-26 | 9 | -14/+45 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint | Junio C Hamano | 2012-04-26 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/commit-unedited-template' into maint | Junio C Hamano | 2012-04-26 | 3 | -24/+65 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/add-p-skip-conflicts' into maint | Junio C Hamano | 2012-04-26 | 2 | -7/+44 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/commit-hook-authorship' into maint | Junio C Hamano | 2012-04-26 | 5 | -47/+141 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-word-diff-regex-sticky' into maint | Junio C Hamano | 2012-04-26 | 2 | -56/+102 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint | Junio C Hamano | 2012-04-26 | 4 | -32/+73 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Sync with 1.7.9.7 | Junio C Hamano | 2012-04-26 | 5 | -4/+55 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Git 1.7.9.7v1.7.9.7maint-1.7.9 | Junio C Hamano | 2012-04-26 | 3 | -2/+16 | |
| | * | | | | | | | | | | | | | | Sync with 1.7.8.6 | Junio C Hamano | 2012-04-26 | 4 | -3/+40 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Git 1.7.8.6v1.7.8.6maint-1.7.8 | Junio C Hamano | 2012-04-26 | 4 | -3/+27 | |
| | | * | | | | | | | | | | | | | Sync with 1.7.7.7 | Junio C Hamano | 2012-04-26 | 3 | -2/+16 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | Git 1.7.7.7v1.7.7.7maint-1.7.7 | Junio C Hamano | 2012-04-26 | 4 | -3/+18 | |
| | | | * | | | | | | | | | | | | | bundle: remove stray single-quote from error message | Jonathan Nieder | 2012-04-26 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | The fifth batch of topics graduated to 'master' | Junio C Hamano | 2012-04-24 | 1 | -0/+26 | |
* | | | | | | | | | | | | | | | | | Merge branch 'fc/completion-tests' | Junio C Hamano | 2012-04-24 | 2 | -9/+256 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | completion: fix completion after 'git --option <TAB>' | SZEDER Gábor | 2012-04-21 | 2 | -1/+19 | |
| * | | | | | | | | | | | | | | | | | completion: avoid trailing space for --exec-path | Jonathan Nieder | 2012-04-21 | 2 | -1/+7 | |
| * | | | | | | | | | | | | | | | | | completion: add missing general options | Felipe Contreras | 2012-04-21 | 2 | -0/+18 | |
| * | | | | | | | | | | | | | | | | | completion: simplify by using $prev | Felipe Contreras | 2012-04-21 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | completion: simplify __gitcomp_1 | Felipe Contreras | 2012-04-21 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | tests: add tests for the __gitcomp() completion helper function | SZEDER Gábor | 2012-04-21 | 1 | -0/+85 | |
| * | | | | | | | | | | | | | | | | | tests: add initial bash completion tests | Felipe Contreras | 2012-04-15 | 1 | -0/+120 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'cc/fix-missing-va-end-in-revert' | Junio C Hamano | 2012-04-24 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | revert: add missing va_end | Christian Couder | 2012-04-21 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj/upstream-error-message' | Junio C Hamano | 2012-04-24 | 2 | -7/+94 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | i18n: mark @{upstream} error messages for translation | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 2 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | | | Be more specific if upstream branch is not tracked | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 2 | -4/+9 | |
| * | | | | | | | | | | | | | | | | | | | Provide better message for barnhc_wiht_tpyo@{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 2 | -2/+5 | |
| * | | | | | | | | | | | | | | | | | | | Provide branch name in error message when using @{u} | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 2 | -6/+10 | |
| * | | | | | | | | | | | | | | | | | | | t1507: add tests to document @{upstream} behaviour | Zbigniew Jędrzejewski-Szmek | 2012-04-15 | 1 | -3/+78 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'mk/gitweb-diff-hl' | Junio C Hamano | 2012-04-24 | 2 | -87/+244 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | gitweb: Refinement highlightning in combined diffs | Michał Kiedrowicz | 2012-04-11 | 1 | -13/+42 | |
| * | | | | | | | | | | | | | | | | | | | gitweb: Highlight interesting parts of diff | Michał Kiedrowicz | 2012-04-11 | 2 | -12/+103 | |
| * | | | | | | | | | | | | | | | | | | | gitweb: Push formatting diff lines to print_diff_chunk() | Michał Kiedrowicz | 2012-04-11 | 1 | -19/+18 | |
| * | | | | | | | | | | | | | | | | | | | gitweb: Use print_diff_chunk() for both side-by-side and inline diffs | Michał Kiedrowicz | 2012-04-11 | 1 | -16/+39 | |
| * | | | | | | | | | | | | | | | | | | | gitweb: Extract print_sidebyside_diff_lines() | Michał Kiedrowicz | 2012-04-11 | 1 | -45/+51 | |
| * | | | | | | | | | | | | | | | | | | | gitweb: Pass esc_html_hl_regions() options to esc_html() | Jakub Narębski | 2012-04-11 | 1 | -4/+7 | |
| * | | | | | | | | | | | | | | | | | | | gitweb: esc_html_hl_regions(): Don't create empty <span> elements | Michał Kiedrowicz | 2012-04-11 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | | | | | gitweb: Use descriptive names in esc_html_hl_regions() | Michał Kiedrowicz | 2012-04-11 | 1 | -5/+8 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'it/fetch-pack-many-refs' | Junio C Hamano | 2012-04-24 | 6 | -6/+162 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | remote-curl: main test case for the OS command line overflow | Ivan Todoroski | 2012-04-10 | 1 | -0/+31 |