aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-12
* fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-12
* add 'merge.stat' config variableSZEDER Gábor2008-04-12
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-12
* doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-12
* Merge branch 'maint'Junio C Hamano2008-04-12
|\
| * t7401: squelch garbage outputJunio C Hamano2008-04-12
| * Documentation/git-submodule: typofixJunio C Hamano2008-04-12
| * Fix config key miscount in url.*.insteadOfDaniel Barkalow2008-04-12
| * Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-12
| |\
| | * Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)Clifford Caoile2008-04-12
| | * Document -w option to shortlogJunio C Hamano2008-04-12
| | * bisect: report bad rev betterChristian Couder2008-04-12
* | | git_config_bool_or_int()Junio C Hamano2008-04-12
* | | Merge branch 'maint'Junio C Hamano2008-04-11
|\ \ \ | |/ /
| * | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-11
| |\ \ | | |/
| | * bisect: fix bad rev checking in "git bisect good"Christian Couder2008-04-11
| | * revision.c: make --date-order overriddableMichele Ballabio2008-04-11
| | * Fix section about backdating tags in the git-tag docsBjörn Steinbrink2008-04-11
| | * Document option --only of git commitJohannes Sixt2008-04-11
| | * Documentation/git-request-pull: Fixed a typo ("send" -> "end")Dirk Suesserott2008-04-11
| * | git-submodule: Avoid 'fatal: cannot describe' messagePing Yin2008-04-11
| * | Force the medium pretty format on calls to git logPedro Melo2008-04-11
* | | bisect: add "git bisect help" subcommand to get a long usage stringChristian Couder2008-04-11
* | | builtin-commit.c: Remove a redundant assignment.Johannes Sixt2008-04-11
* | | Merge branch 'maint'Junio C Hamano2008-04-10
|\ \ \ | |/ /
| * | git-fetch: fix status output when not storing tracking refJeff King2008-04-10
| * | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-10
| |\ \ | | |/
| | * core-tutorial.txt: Fix showing the current behaviour.Carlos Rica2008-04-10
| | * git-archive: ignore prefix when checking file attributeRené Scharfe2008-04-10
| | * Fix documentation syntax of optional arguments in short options.Carlos Rica2008-04-10
* | | Merge branch 'jc/rename'Junio C Hamano2008-04-09
|\ \ \
| * | | Optimize rename detection for a huge diffJunio C Hamano2008-02-13
* | | | Merge branch 'gp/gitweb'Junio C Hamano2008-04-09
|\ \ \ \
| * | | | gitweb: fallback to system-wide config file (fixup)Gerrit Pape2008-04-05
| * | | | gitweb: fallback to system-wide config file if default config does not existGerrit Pape2008-03-27
* | | | | Merge branch 'mk/unpack-careful'Junio C Hamano2008-04-09
|\ \ \ \ \
| * | | | | t5300: add test for "index-pack --strict"Martin Koegler2008-03-07
| * | | | | receive-pack: allow using --strict mode for unpacking objectsMartin Koegler2008-03-05
| * | | | | unpack-objects: fix --strict handlingJunio C Hamano2008-03-05
| * | | | | t5300: add test for "unpack-objects --strict"Junio C Hamano2008-03-05
| * | | | | unpack-objects: prevent writing of inconsistent objectsMartin Koegler2008-03-05
* | | | | | Merge branch 'fl/send-email-outside'Junio C Hamano2008-04-09
|\ \ \ \ \ \
| * | | | | | send-email: Don't require to be called in a repositoryFrank Lichtenheld2008-03-15
| * | | | | | Git.pm: Don't require repository instance for identFrank Lichtenheld2008-03-15
| * | | | | | Git.pm: Don't require a repository instance for configFrank Lichtenheld2008-03-15
| * | | | | | var: Don't require to be in a git repository.Frank Lichtenheld2008-03-15
* | | | | | | Merge branch 'jc/rebase'Junio C Hamano2008-04-09
|\ \ \ \ \ \ \
| * | | | | | | rebase [--onto O] A B: omit needless checkoutJunio C Hamano2008-03-16
* | | | | | | | Merge branch 'jk/add-i-mode'Junio C Hamano2008-04-09
|\ \ \ \ \ \ \ \