summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Spelling fixes in the gitweb documentationRafael Garcia-Suarez2008-04-222-64/+65
* git.el: Set process-environment instead of invoking envClifford Caoile2008-04-221-7/+4
* First batch of post 1.5.5 updatesJunio C Hamano2008-04-212-1/+60
* Merge branch 'maint'Junio C Hamano2008-04-213-1/+48
|\
| * GIT 1.5.5.1v1.5.5.1Junio C Hamano2008-04-203-1/+48
| * Merge branch 'jc/maint-rebase-am' into maintJunio C Hamano2008-04-202-5/+55
| |\
* | \ Merge branch 'jc/sha1-lookup'Junio C Hamano2008-04-204-3/+214
|\ \ \
| * | | sha1-lookup: make selection of 'middle' less aggressiveJunio C Hamano2008-04-091-7/+26
| * | | sha1-lookup: more memory efficient search in sorted list of SHA-1Junio C Hamano2008-04-094-3/+195
* | | | Merge branch 'jc/dirstat'Junio C Hamano2008-04-201-23/+60
|\ \ \ \
| * | | | diff: make --dirstat binary-file safeJunio C Hamano2008-04-091-23/+60
| |/ / /
* | | | Merge branch 'mv/defer-gc'Junio C Hamano2008-04-203-0/+74
|\ \ \ \
| * | | | contrib/hooks: add an example pre-auto-gc hookMiklos Vajna2008-04-091-0/+36
| * | | | Documentation/hooks: add pre-auto-gc hookMiklos Vajna2008-04-091-0/+7
| * | | | git-gc --auto: add pre-auto-gc hookMiklos Vajna2008-04-091-0/+31
* | | | | Merge branch 'py/submodule'Junio C Hamano2008-04-205-2/+207
|\ \ \ \ \
| * | | | | builtin-status: Add tests for submodule summaryPing Yin2008-04-131-0/+134
| * | | | | builtin-status: submodule summary supportPing Yin2008-04-132-0/+46
| * | | | | git-submodule summary: --for-status optionPing Yin2008-04-132-2/+27
* | | | | | Merge branch 'jc/terminator-separator'Junio C Hamano2008-04-207-31/+43
|\ \ \ \ \ \
| * | | | | | log: teach "terminator" vs "separator" mode to "--pretty=format"Junio C Hamano2008-04-107-31/+43
* | | | | | | Merge branch 'jk/remote-default-show'Junio C Hamano2008-04-201-1/+6
|\ \ \ \ \ \ \
| * | | | | | | git-remote: show all remotes with "git remote show"Jeff King2008-04-101-1/+6
| |/ / / / / /
* | | | | | | Merge branch 'mk/color'Junio C Hamano2008-04-202-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Use color.ui variable in scripts tooMatthias Kestenholz2008-04-102-1/+7
| |/ / / / / /
* | | | | | | Merge branch 'jc/maint-rebase-am'Junio C Hamano2008-04-192-5/+55
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | rebase: do not munge commit log messageJunio C Hamano2008-04-162-5/+55
* | | | | | | Merge branch 'maint'Junio C Hamano2008-04-198-22/+97
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | gitweb: Fix 'history' view for deleted files with historyJakub Narebski2008-04-192-3/+31
| * | | | | | Document that WebDAV doesn't need git on the server, and works over SSLMatthieu Moy2008-04-191-12/+33
| * | | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-191-1/+1
| |\ \ \ \ \ \
| | * | | | | | am: POSIX portability fixJunio C Hamano2008-04-191-1/+1
| * | | | | | | git-remote: reject adding remotes with invalid namesJonas Fonseca2008-04-194-6/+32
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-04-172-22/+33
|\| | | | | | |
| * | | | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-172-22/+33
| |\| | | | | | | | |/ / / / / | |/| | | | |
| | * | | | | git-am: minor cleanupJunio C Hamano2008-04-171-2/+1
| | * | | | | Clarify and fix English in "git-rm" documentationJon Loeliger2008-04-171-20/+32
* | | | | | | Merge branch 'maint'Junio C Hamano2008-04-166-33/+54
|\| | | | | |
| * | | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-166-33/+54
| |\| | | | |
| | * | | | | git-bisect: make "start", "good" and "skip" succeed or fail atomicallyChristian Couder2008-04-162-5/+16
| | * | | | | git-am: cope better with an empty Subject: lineLinus Torvalds2008-04-161-14/+10
| | * | | | | Ignore leading empty lines while summarizing mergesLinus Torvalds2008-04-161-1/+9
| | * | | | | bisect: squelch "fatal: ref HEAD not a symref" misleading messageChristian Couder2008-04-161-1/+1
| | * | | | | builtin-apply: Show a more descriptive error on failure when opening a patchAlberto Bertogli2008-04-161-1/+1
| | * | | | | Clarify documentation of git-cvsserver, particularly in relation to git-shellScott Collins2008-04-161-11/+17
* | | | | | | Merge branch 'maint'Junio C Hamano2008-04-154-10/+13
|\| | | | | |
| * | | | | | git clean: Add test to verify directories aren't removed with a prefixShawn Bohrer2008-04-151-2/+3
| * | | | | | git clean: Don't automatically remove directories when run within subdirectoryShawn Bohrer2008-04-152-7/+8
| * | | | | | git-submodule - possibly use branch name to describe a moduleMark Levedahl2008-04-151-1/+2
* | | | | | | builtin-apply.c: use git_config_string() to get apply_default_whitespaceStephan Beyer2008-04-151-6/+2