summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-151-1/+9
| | * bisect: squelch "fatal: ref HEAD not a symref" misleading messageChristian Couder2008-04-151-1/+1
| | * builtin-apply: Show a more descriptive error on failure when opening a patchAlberto Bertogli2008-04-151-1/+1
| | * Clarify documentation of git-cvsserver, particularly in relation to git-shellScott Collins2008-04-151-11/+17
* | | Merge branch 'maint'Junio C Hamano2008-04-144-10/+13
|\ \ \ | |/ /
| * | git clean: Add test to verify directories aren't removed with a prefixShawn Bohrer2008-04-141-2/+3
| * | git clean: Don't automatically remove directories when run within subdirectoryShawn Bohrer2008-04-142-7/+8
| * | git-submodule - possibly use branch name to describe a moduleMark Levedahl2008-04-141-1/+2
* | | builtin-apply.c: use git_config_string() to get apply_default_whitespaceStephan Beyer2008-04-141-6/+2
* | | Fix git_config_bool_or_intJunio C Hamano2008-04-133-4/+80
* | | Merge branch 'maint'Junio C Hamano2008-04-128-12/+23
|\ \ \ | |/ /
| * | t7401: squelch garbage outputJunio C Hamano2008-04-121-1/+1
| * | Documentation/git-submodule: typofixJunio C Hamano2008-04-121-1/+1
| * | Fix config key miscount in url.*.insteadOfDaniel Barkalow2008-04-122-5/+5
| * | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-124-5/+16
| |\ \ | | |/
| | * Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)Clifford Caoile2008-04-121-0/+5
| | * Document -w option to shortlogJunio C Hamano2008-04-122-3/+9
| | * bisect: report bad rev betterChristian Couder2008-04-121-2/+2
* | | git_config_bool_or_int()Junio C Hamano2008-04-122-1/+10
* | | Merge branch 'maint'Junio C Hamano2008-04-119-15/+36
|\ \ \ | |/ /
| * | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-117-13/+34
| |\ \ | | |/
| | * bisect: fix bad rev checking in "git bisect good"Christian Couder2008-04-112-9/+18
| | * revision.c: make --date-order overriddableMichele Ballabio2008-04-111-0/+1
| | * Fix section about backdating tags in the git-tag docsBjörn Steinbrink2008-04-111-2/+2
| | * Document option --only of git commitJohannes Sixt2008-04-112-1/+12
| | * Documentation/git-request-pull: Fixed a typo ("send" -> "end")Dirk Suesserott2008-04-111-1/+1
| * | git-submodule: Avoid 'fatal: cannot describe' messagePing Yin2008-04-111-1/+1
| * | Force the medium pretty format on calls to git logPedro Melo2008-04-111-1/+1
* | | bisect: add "git bisect help" subcommand to get a long usage stringChristian Couder2008-04-112-3/+16
* | | builtin-commit.c: Remove a redundant assignment.Johannes Sixt2008-04-111-3/+1
* | | Merge branch 'maint'Junio C Hamano2008-04-108-30/+45
|\ \ \ | |/ /
| * | git-fetch: fix status output when not storing tracking refJeff King2008-04-101-15/+13
| * | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-107-15/+32
| |\ \ | | |/
| | * core-tutorial.txt: Fix showing the current behaviour.Carlos Rica2008-04-101-6/+6
| | * git-archive: ignore prefix when checking file attributeRené Scharfe2008-04-103-5/+22
| | * Fix documentation syntax of optional arguments in short options.Carlos Rica2008-04-103-4/+4
* | | Merge branch 'jc/rename'Junio C Hamano2008-04-091-22/+58
|\ \ \
| * | | Optimize rename detection for a huge diffJunio C Hamano2008-02-131-22/+58
* | | | Merge branch 'gp/gitweb'Junio C Hamano2008-04-094-3/+21
|\ \ \ \
| * | | | gitweb: fallback to system-wide config file (fixup)Gerrit Pape2008-04-051-0/+1
| * | | | gitweb: fallback to system-wide config file if default config does not existGerrit Pape2008-03-274-3/+20
* | | | | Merge branch 'mk/unpack-careful'Junio C Hamano2008-04-095-33/+284
|\ \ \ \ \
| * | | | | t5300: add test for "index-pack --strict"Martin Koegler2008-03-071-0/+47
| * | | | | receive-pack: allow using --strict mode for unpacking objectsMartin Koegler2008-03-052-13/+29
| * | | | | unpack-objects: fix --strict handlingJunio C Hamano2008-03-052-17/+58
| * | | | | t5300: add test for "unpack-objects --strict"Junio C Hamano2008-03-051-0/+48