summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'jm/maint-strncpy-diff-no-index'Junio C Hamano2012-04-261-21/+17
|\ \ \ \ \
| * | | | | diff --no-index: use strbuf for temporary pathnamesJunio C Hamano2012-04-261-23/+17
| * | | | | diff: avoid stack-buffer-read-overrun for very long nameJim Meyering2012-04-161-0/+2
| |/ / / /
* | | | | Merge bundle error message fix inJunio C Hamano2012-04-266-4/+105
|\ \ \ \ \
| * | | | | Start preparing for 1.7.10.1Junio C Hamano2012-04-262-1/+51
| * | | | | Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-266-7/+86
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-262-8/+72
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2012-04-262-11/+43
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-269-14/+45
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maintJunio C Hamano2012-04-261-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-263-24/+65
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2012-04-262-7/+44
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-265-47/+141
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-262-56/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano2012-04-264-32/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.7.9.7Junio C Hamano2012-04-265-4/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Git 1.7.9.7v1.7.9.7maint-1.7.9Junio C Hamano2012-04-263-2/+16
| | * | | | | | | | | | | | | | Sync with 1.7.8.6Junio C Hamano2012-04-264-3/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Git 1.7.8.6v1.7.8.6maint-1.7.8Junio C Hamano2012-04-264-3/+27
| | | * | | | | | | | | | | | | Sync with 1.7.7.7Junio C Hamano2012-04-263-2/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Git 1.7.7.7v1.7.7.7maint-1.7.7Junio C Hamano2012-04-264-3/+18
| | | | * | | | | | | | | | | | | bundle: remove stray single-quote from error messageJonathan Nieder2012-04-261-1/+1
* | | | | | | | | | | | | | | | | The fifth batch of topics graduated to 'master'Junio C Hamano2012-04-241-0/+26
* | | | | | | | | | | | | | | | | Merge branch 'fc/completion-tests'Junio C Hamano2012-04-242-9/+256
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | completion: fix completion after 'git --option <TAB>'SZEDER Gábor2012-04-212-1/+19
| * | | | | | | | | | | | | | | | | completion: avoid trailing space for --exec-pathJonathan Nieder2012-04-212-1/+7
| * | | | | | | | | | | | | | | | | completion: add missing general optionsFelipe Contreras2012-04-212-0/+18
| * | | | | | | | | | | | | | | | | completion: simplify by using $prevFelipe Contreras2012-04-211-2/+2
| * | | | | | | | | | | | | | | | | completion: simplify __gitcomp_1Felipe Contreras2012-04-211-6/+6
| * | | | | | | | | | | | | | | | | tests: add tests for the __gitcomp() completion helper functionSZEDER Gábor2012-04-211-0/+85
| * | | | | | | | | | | | | | | | | tests: add initial bash completion testsFelipe Contreras2012-04-151-0/+120
* | | | | | | | | | | | | | | | | | Merge branch 'cc/fix-missing-va-end-in-revert'Junio C Hamano2012-04-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | revert: add missing va_endChristian Couder2012-04-211-0/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'zj/upstream-error-message'Junio C Hamano2012-04-242-7/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek2012-04-152-9/+9
| * | | | | | | | | | | | | | | | | | | Be more specific if upstream branch is not trackedZbigniew Jędrzejewski-Szmek2012-04-152-4/+9
| * | | | | | | | | | | | | | | | | | | Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek2012-04-152-2/+5
| * | | | | | | | | | | | | | | | | | | Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek2012-04-152-6/+10
| * | | | | | | | | | | | | | | | | | | t1507: add tests to document @{upstream} behaviourZbigniew Jędrzejewski-Szmek2012-04-151-3/+78
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mk/gitweb-diff-hl'Junio C Hamano2012-04-242-87/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | gitweb: Refinement highlightning in combined diffsMichał Kiedrowicz2012-04-111-13/+42
| * | | | | | | | | | | | | | | | | | | gitweb: Highlight interesting parts of diffMichał Kiedrowicz2012-04-112-12/+103
| * | | | | | | | | | | | | | | | | | | gitweb: Push formatting diff lines to print_diff_chunk()Michał Kiedrowicz2012-04-111-19/+18
| * | | | | | | | | | | | | | | | | | | gitweb: Use print_diff_chunk() for both side-by-side and inline diffsMichał Kiedrowicz2012-04-111-16/+39
| * | | | | | | | | | | | | | | | | | | gitweb: Extract print_sidebyside_diff_lines()Michał Kiedrowicz2012-04-111-45/+51
| * | | | | | | | | | | | | | | | | | | gitweb: Pass esc_html_hl_regions() options to esc_html()Jakub Narębski2012-04-111-4/+7
| * | | | | | | | | | | | | | | | | | | gitweb: esc_html_hl_regions(): Don't create empty <span> elementsMichał Kiedrowicz2012-04-111-0/+3
| * | | | | | | | | | | | | | | | | | | gitweb: Use descriptive names in esc_html_hl_regions()Michał Kiedrowicz2012-04-111-5/+8
* | | | | | | | | | | | | | | | | | | | Merge branch 'it/fetch-pack-many-refs'Junio C Hamano2012-04-246-6/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | remote-curl: main test case for the OS command line overflowIvan Todoroski2012-04-101-0/+31