aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* fmt-merge-msg: Add contents of merged tag in the merge messageJunio C Hamano2011-11-08
* fmt-merge-msg: package options into a structureJunio C Hamano2011-11-07
* fmt-merge-msg: avoid early returnsJunio C Hamano2011-11-07
* refs DWIMmery: use the same rule for both "git fetch" and othersJunio C Hamano2011-11-07
* fetch: allow "git fetch $there v1.0" to fetch a tagJunio C Hamano2011-11-07
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-07
* fetch: do not store peeled tag object names in FETCH_HEADLinus Torvalds2011-11-04
* Split GPG interface into its own helper libraryJunio C Hamano2011-11-04
* Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-19
|\
| * Teach merge the '[-e|--edit]' optionJay Soffian2011-10-12
* | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-19
|\ \
| * | diff: add option to show whole functions as contextRené Scharfe2011-10-10
| * | xdiff: factor out get_func_line()René Scharfe2011-10-10
| |/
* | Merge branch 'rs/pickaxe'Junio C Hamano2011-10-19
|\ \
| * | pickaxe: factor out pickaxeRené Scharfe2011-10-07
| * | pickaxe: give diff_grep the same signature as has_changesRené Scharfe2011-10-07
| * | pickaxe: pass diff_options to contains and has_changesRené Scharfe2011-10-07
| * | pickaxe: factor out has_changesRené Scharfe2011-10-07
| * | pickaxe: plug regex/kws leakRené Scharfe2011-10-07
| * | pickaxe: plug regex leakRené Scharfe2011-10-07
| * | pickaxe: plug diff filespec leak with empty needleRené Scharfe2011-10-07
| |/
* | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-19
|\ \
| * \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-06
| |\ \
| | * | cherry-pick: do not give irrelevant advice when cherry-pick puntedJay Soffian2011-10-06
| | * | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-06
* | | | Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano2011-10-19
|\ \ \ \
| * | | | submodule: Search for merges only at end of recursive mergeBrad King2011-10-13
| * | | | submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-13
* | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-19
|\ \ \ \ \
| * | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-12
* | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-19
|\ \ \ \ \ \
| * | | | | | t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt2011-10-19
* | | | | | | Merge branch 'js/log-show-children'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \
| * | | | | | | log --childrenJay Soffian2011-10-04
* | | | | | | | Merge branch 'cb/httpd-test-fix-port'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \
| * | | | | | | | use test number as port numberClemens Buchacher2011-10-17
* | | | | | | | | Merge branch 'jn/gitweb-manpages'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: Add gitweb manpages to 'gitweb' package in git.specJakub Narebski2011-10-16
| * | | | | | | | | Documentation: Add gitweb config variables to git-config(1)Jakub Narebski2011-10-16
| * | | | | | | | | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpagesJakub Narebski2011-10-16
| * | | | | | | | | gitweb: Add gitweb(1) manpage for gitweb itselfJakub Narebski2011-10-16
| * | | | | | | | | gitweb: Add gitweb.conf(5) manpage for gitweb configuration filesDrew Northup2011-10-16
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'pt/mingw-misc-fixes'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9901: fix line-ending dependency on windowsPat Thoyts2011-10-15
| * | | | | | | | | mingw: ensure sockets are initialized before calling gethostnamePat Thoyts2011-10-15
| * | | | | | | | | mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts2011-10-15
| * | | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGWJohannes Schindelin2011-10-14
| * | | | | | | | | git-svn: On MSYS, escape and quote SVN_SSH also if set by the userSebastian Schuberth2011-10-14
| * | | | | | | | | t9001: do not fail only due to CR/LF issuesJohannes Schindelin2011-10-14
| * | | | | | | | | t1020: disable the pwd test on MinGWJohannes Schindelin2011-10-14