summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-04-17Do not use SHELL_PATH from build system in prepare_shell_cmd on WindowsLibravatar Johannes Sixt1-0/+4
2012-04-16RelNotes: the second batch of topics graduated to 'master'Libravatar Junio C Hamano1-0/+41
2012-04-16Merge branch 'jk/add-p-skip-conflicts'Libravatar Junio C Hamano2-7/+44
2012-04-16Merge branch 'jc/commit-unedited-template'Libravatar Junio C Hamano3-24/+65
2012-04-16Merge branch 'bw/spawn-via-shell-path'Libravatar Junio C Hamano2-1/+12
2012-04-16Merge branch 'wk/gitweb-snapshot-use-if-modified-since'Libravatar Junio C Hamano2-27/+98
2012-04-16Merge branch 'jk/http-backend-keep-committer-ident-env'Libravatar Junio C Hamano3-13/+37
2012-04-16Merge branch 'sl/autoconf'Libravatar Junio C Hamano1-98/+99
2012-04-16Merge branch 'jk/branch-quiet'Libravatar Junio C Hamano5-11/+22
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Libravatar Junio C Hamano1-1/+1
2012-04-16Merge branch 'jk/diff-no-rename-empty'Libravatar Junio C Hamano9-14/+45
2012-04-16Merge branch 'jc/maint-clean-nested-worktree-in-subdir'Libravatar Junio C Hamano2-11/+43
2012-04-16Merge branch 'rs/unpack-trees-leakfix'Libravatar Junio C Hamano1-10/+17
2012-04-16Merge branch 'nl/rebase-i-cheat-sheet'Libravatar Junio C Hamano1-0/+2
2012-04-15RelNotes: the first batch of topics graduated to 'master'Libravatar Junio C Hamano1-0/+19
2012-04-15Merge branch 'da/difftool-test'Libravatar Junio C Hamano1-0/+11
2012-04-15Merge branch 'zj/test-cred-helper-nicer-prove'Libravatar Junio C Hamano1-24/+45
2012-04-15Merge branch 'jh/notes-merge-in-git-dir-worktree'Libravatar Junio C Hamano4-32/+73
2012-04-15Merge branch 'tr/maint-word-diff-regex-sticky'Libravatar Junio C Hamano2-56/+102
2012-04-15Merge branch 'jn/diffstat-tests'Libravatar Junio C Hamano16-259/+354
2012-04-15Merge branch 'jc/diff-algo-cleanup'Libravatar Junio C Hamano8-25/+24
2012-04-15Merge branch 'jc/commit-hook-authorship'Libravatar Junio C Hamano5-47/+141
2012-04-15Merge branch 'nd/stream-more'Libravatar Junio C Hamano11-75/+221
2012-04-15merge overwrites unstaged changes in renamed fileLibravatar Clemens Buchacher1-0/+9
2012-04-15i18n: mark @{upstream} error messages for translationLibravatar Zbigniew Jędrzejewski-Szmek2-9/+9
2012-04-15Be more specific if upstream branch is not trackedLibravatar Zbigniew Jędrzejewski-Szmek2-4/+9
2012-04-15Provide better message for barnhc_wiht_tpyo@{u}Libravatar Zbigniew Jędrzejewski-Szmek2-2/+5
2012-04-15Provide branch name in error message when using @{u}Libravatar Zbigniew Jędrzejewski-Szmek2-6/+10
2012-04-15t1507: add tests to document @{upstream} behaviourLibravatar Zbigniew Jędrzejewski-Szmek1-3/+78
2012-04-15tests: add initial bash completion testsLibravatar Felipe Contreras1-0/+120
2012-04-15fast-import doc: cat-blob and ls responses need to be consumed quicklyLibravatar Jonathan Nieder1-3/+39
2012-04-14submodules: recursive fetch also checks new tags for submodule commitsLibravatar Jens Lehmann1-3/+3
2012-04-14test: am of empty patch should not succeedLibravatar Jonathan Nieder1-1/+1
2012-04-14test: use test_i18ncmp for "Patch format detection failed" messageLibravatar Jonathan Nieder1-1/+1
2012-04-14test: do not rely on US English tracking-info messagesLibravatar Jonathan Nieder2-6/+6
2012-04-12Fix httpd tests that broke when non-ff push advice changedLibravatar Christopher Tiwald2-2/+2
2012-04-11apply: document buffer ownership rules across functionsLibravatar Junio C Hamano1-2/+51
2012-04-11apply: tighten constness of line bufferLibravatar Junio C Hamano1-7/+7
2012-04-11apply: drop unused macroLibravatar Junio C Hamano1-1/+0
2012-04-11gitweb: Refinement highlightning in combined diffsLibravatar Michał Kiedrowicz1-13/+42
2012-04-11gitweb: Highlight interesting parts of diffLibravatar Michał Kiedrowicz2-12/+103
2012-04-11gitweb: Push formatting diff lines to print_diff_chunk()Libravatar Michał Kiedrowicz1-19/+18
2012-04-11gitweb: Use print_diff_chunk() for both side-by-side and inline diffsLibravatar Michał Kiedrowicz1-16/+39
2012-04-11gitweb: Extract print_sidebyside_diff_lines()Libravatar Michał Kiedrowicz1-45/+51
2012-04-11gitweb: Pass esc_html_hl_regions() options to esc_html()Libravatar Jakub Narębski1-4/+7
2012-04-11gitweb: esc_html_hl_regions(): Don't create empty <span> elementsLibravatar Michał Kiedrowicz1-0/+3
2012-04-11gitweb: Use descriptive names in esc_html_hl_regions()Libravatar Michał Kiedrowicz1-5/+8
2012-04-11blame: accept --need-minimalLibravatar Junio C Hamano1-0/+1
2012-04-11Kick off post 1.7.10 cycleLibravatar Junio C Hamano3-2/+31
2012-04-11gitweb: Fix unintended "--no-merges" for regular Atom feedLibravatar Sebastian Pipping1-0/+1