summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* parse_commit_date(): advance the scan pointer for the callerjc/commit-parsingJunio C Hamano2011-10-201-12/+28
* parse_commit_buffer(): notice NUL in the commit bufferJunio C Hamano2011-10-202-0/+5
* Update draft release notes to 1.7.8Junio C Hamano2011-10-191-2/+22
* t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir scriptBrandon Casey2011-10-191-1/+1
* Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-193-39/+99
|\
| * Teach merge the '[-e|--edit]' optionJay Soffian2011-10-123-39/+99
* | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-196-16/+175
|\ \
| * | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-106-6/+154
| * | xdiff: factor out get_func_line()René Scharfe2011-10-101-16/+27
| |/
* | Merge branch 'rs/pickaxe'Junio C Hamano2011-10-191-108/+70
|\ \
| * | pickaxe: factor out pickaxers/pickaxeRené Scharfe2011-10-071-67/+43
| * | pickaxe: give diff_grep the same signature as has_changesRené Scharfe2011-10-071-3/+4
| * | pickaxe: pass diff_options to contains and has_changesRené Scharfe2011-10-071-14/+14
| * | pickaxe: factor out has_changesRené Scharfe2011-10-071-36/+21
| * | pickaxe: plug regex/kws leakRené Scharfe2011-10-071-6/+7
| * | pickaxe: plug regex leakRené Scharfe2011-10-071-7/+6
| * | pickaxe: plug diff filespec leak with empty needleRené Scharfe2011-10-071-2/+2
| |/
* | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-192-7/+31
|\ \
| * \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-062-7/+31
| |\ \
| | * | cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-puntedJay Soffian2011-10-061-5/+7
| | * | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-062-2/+24
* | | | Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano2011-10-194-4/+61
|\ \ \ \
| * | | | submodule: Search for merges only at end of recursive mergeBrad King2011-10-134-5/+11
| * | | | submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-131-0/+51
* | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-192-0/+46
|\ \ \ \ \
| * | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-122-0/+46
* | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-191-12/+7
|\ \ \ \ \ \
| * | | | | | t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt2011-10-191-12/+7
* | | | | | | Merge branch 'js/log-show-children'Junio C Hamano2011-10-181-0/+12
|\ \ \ \ \ \ \
| * | | | | | | log --childrenjs/log-show-childrenJay Soffian2011-10-041-0/+12
* | | | | | | | Merge branch 'cb/httpd-test-fix-port'Junio C Hamano2011-10-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | use test number as port numbercb/httpd-test-fix-portClemens Buchacher2011-10-171-1/+1
* | | | | | | | | Merge branch 'jn/gitweb-manpages'Junio C Hamano2011-10-189-479/+1649
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: Add gitweb manpages to 'gitweb' package in git.specjn/gitweb-manpagesJakub Narebski2011-10-161-0/+7
| * | | | | | | | | Documentation: Add gitweb config variables to git-config(1)Jakub Narebski2011-10-161-0/+17
| * | | | | | | | | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpagesJakub Narebski2011-10-162-0/+5
| * | | | | | | | | gitweb: Add gitweb(1) manpage for gitweb itselfJakub Narebski2011-10-165-346/+743
| * | | | | | | | | gitweb: Add gitweb.conf(5) manpage for gitweb configuration filesDrew Northup2011-10-163-134/+878
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'pt/mingw-misc-fixes'Junio C Hamano2011-10-188-29/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9901: fix line-ending dependency on windowsPat Thoyts2011-10-151-15/+12
| * | | | | | | | | mingw: ensure sockets are initialized before calling gethostnamePat Thoyts2011-10-152-0/+10
| * | | | | | | | | mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts2011-10-151-1/+6
| * | | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGWJohannes Schindelin2011-10-141-4/+4
| * | | | | | | | | git-svn: On MSYS, escape and quote SVN_SSH also if set by the userSebastian Schuberth2011-10-141-8/+7
| * | | | | | | | | t9001: do not fail only due to CR/LF issuesJohannes Schindelin2011-10-141-0/+1
| * | | | | | | | | t1020: disable the pwd test on MinGWJohannes Schindelin2011-10-141-1/+1
* | | | | | | | | | Merge branch 'md/smtp-tls-hello-again'Junio C Hamano2011-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | send-email: Honour SMTP domain when using TLSMatthew Daley2011-10-151-1/+1
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-181-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()Brandon Casey2011-10-181-1/+0
View Lorry Controller Status