Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fetch: do not store peeled tag object names in FETCH_HEAD | Linus Torvalds | 2011-11-04 | 59 | -176/+175 |
* | Split GPG interface into its own helper library | Junio C Hamano | 2011-11-04 | 6 | -100/+166 |
* | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 | 3 | -39/+99 |
|\ | |||||
| * | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 | 3 | -39/+99 |
* | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 6 | -16/+175 |
|\ \ | |||||
| * | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 6 | -6/+154 |
| * | | xdiff: factor out get_func_line() | René Scharfe | 2011-10-10 | 1 | -16/+27 |
| |/ | |||||
* | | Merge branch 'rs/pickaxe' | Junio C Hamano | 2011-10-19 | 1 | -108/+70 |
|\ \ | |||||
| * | | pickaxe: factor out pickaxers/pickaxe | René Scharfe | 2011-10-07 | 1 | -67/+43 |
| * | | pickaxe: give diff_grep the same signature as has_changes | René Scharfe | 2011-10-07 | 1 | -3/+4 |
| * | | pickaxe: pass diff_options to contains and has_changes | René Scharfe | 2011-10-07 | 1 | -14/+14 |
| * | | pickaxe: factor out has_changes | René Scharfe | 2011-10-07 | 1 | -36/+21 |
| * | | pickaxe: plug regex/kws leak | René Scharfe | 2011-10-07 | 1 | -6/+7 |
| * | | pickaxe: plug regex leak | René Scharfe | 2011-10-07 | 1 | -7/+6 |
| * | | pickaxe: plug diff filespec leak with empty needle | René Scharfe | 2011-10-07 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'js/no-cherry-pick-head-after-punted' | Junio C Hamano | 2011-10-19 | 2 | -7/+31 |
|\ \ | |||||
| * \ | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... | Junio C Hamano | 2011-10-06 | 2 | -7/+31 |
| |\ \ | |||||
| | * | | cherry-pick: do not give irrelevant advice when cherry-pick puntedjs/maint-no-cherry-pick-head-after-punted | Jay Soffian | 2011-10-06 | 1 | -5/+7 |
| | * | | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so | Jay Soffian | 2011-10-06 | 2 | -2/+24 |
* | | | | Merge branch 'bk/submodule-in-recursive-merge' | Junio C Hamano | 2011-10-19 | 4 | -4/+61 |
|\ \ \ \ | |||||
| * | | | | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 | 4 | -5/+11 |
| * | | | | submodule: Demonstrate known breakage during recursive merge | Brad King | 2011-10-13 | 1 | -0/+51 |
* | | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 | 2 | -0/+46 |
|\ \ \ \ \ | |||||
| * | | | | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 | 2 | -0/+46 |
* | | | | | | Merge branch 'jk/config-test-cleanup' | Junio C Hamano | 2011-10-19 | 1 | -12/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t1300: attempting to remove a non-existent .git/config is not an error | Johannes Sixt | 2011-10-19 | 1 | -12/+7 |
* | | | | | | | Merge branch 'js/log-show-children' | Junio C Hamano | 2011-10-18 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | log --childrenjs/log-show-children | Jay Soffian | 2011-10-04 | 1 | -0/+12 |
* | | | | | | | | Merge branch 'cb/httpd-test-fix-port' | Junio C Hamano | 2011-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | use test number as port numbercb/httpd-test-fix-port | Clemens Buchacher | 2011-10-17 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jn/gitweb-manpages' | Junio C Hamano | 2011-10-18 | 9 | -479/+1649 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gitweb: Add gitweb manpages to 'gitweb' package in git.specjn/gitweb-manpages | Jakub Narebski | 2011-10-16 | 1 | -0/+7 |
| * | | | | | | | | | Documentation: Add gitweb config variables to git-config(1) | Jakub Narebski | 2011-10-16 | 1 | -0/+17 |
| * | | | | | | | | | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages | Jakub Narebski | 2011-10-16 | 2 | -0/+5 |
| * | | | | | | | | | gitweb: Add gitweb(1) manpage for gitweb itself | Jakub Narebski | 2011-10-16 | 5 | -346/+743 |
| * | | | | | | | | | gitweb: Add gitweb.conf(5) manpage for gitweb configuration files | Drew Northup | 2011-10-16 | 3 | -134/+878 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'pt/mingw-misc-fixes' | Junio C Hamano | 2011-10-18 | 8 | -29/+41 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t9901: fix line-ending dependency on windows | Pat Thoyts | 2011-10-15 | 1 | -15/+12 |
| * | | | | | | | | | mingw: ensure sockets are initialized before calling gethostname | Pat Thoyts | 2011-10-15 | 2 | -0/+10 |
| * | | | | | | | | | mergetools: use the correct tool for Beyond Compare 3 on Windows | Pat Thoyts | 2011-10-15 | 1 | -1/+6 |
| * | | | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGW | Johannes Schindelin | 2011-10-14 | 1 | -4/+4 |
| * | | | | | | | | | git-svn: On MSYS, escape and quote SVN_SSH also if set by the user | Sebastian Schuberth | 2011-10-14 | 1 | -8/+7 |
| * | | | | | | | | | t9001: do not fail only due to CR/LF issues | Johannes Schindelin | 2011-10-14 | 1 | -0/+1 |
| * | | | | | | | | | t1020: disable the pwd test on MinGW | Johannes Schindelin | 2011-10-14 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'md/smtp-tls-hello-again' | Junio C Hamano | 2011-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | send-email: Honour SMTP domain when using TLS | Matthew Daley | 2011-10-15 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-10-18 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline() | Brandon Casey | 2011-10-18 | 1 | -1/+0 |
* | | | | | | | | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-17 | 1 | -1/+37 |
* | | | | | | | | | | | | Merge branch 'jk/http-auth' | Junio C Hamano | 2011-10-17 | 9 | -69/+130 |
|\ \ \ \ \ \ \ \ \ \ \ \ |