Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow tracking branches to set up rebase by default. | Dustin Sallings | 2008-05-11 | 1 | -0/+15 |
* | Merge branch 'maint' | Junio C Hamano | 2008-05-08 | 2 | -2/+5 |
|\ | |||||
| * | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-05-08 | 2 | -2/+5 |
| |\ | |||||
| | * | Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" | Dustin Sallings | 2008-05-08 | 1 | -1/+2 |
| | * | doc: clarify definition of "update" for git-add -u | Jeff King | 2008-05-08 | 1 | -1/+3 |
* | | | Merge branch 'sg/merge-options' (early part) | Junio C Hamano | 2008-05-08 | 5 | -52/+67 |
|\ \ \ | |||||
| * | | | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 | 1 | -0/+9 |
| * | | | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable | SZEDER Gábor | 2008-04-12 | 2 | -6/+14 |
| * | | | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 | 2 | -1/+5 |
| * | | | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 | 2 | -3/+7 |
| * | | | doc: moved merge.* config variables into separate merge-config.txt | SZEDER Gábor | 2008-04-12 | 3 | -43/+33 |
* | | | | Merge branch 'cc/help' | Junio C Hamano | 2008-05-08 | 3 | -6/+84 |
|\ \ \ \ | |||||
| * | | | | documentation: web--browse: add a note about konqueror | Christian Couder | 2008-04-26 | 1 | -1/+23 |
| * | | | | documentation: help: add info about "man.<tool>.cmd" config var | Christian Couder | 2008-04-26 | 2 | -5/+48 |
| * | | | | documentation: help: add "man.<tool>.path" config variable | Christian Couder | 2008-04-26 | 2 | -0/+13 |
* | | | | | Merge branch 'dm/cherry-pick-s' | Junio C Hamano | 2008-05-08 | 2 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Allow cherry-pick (and revert) to add signoff line | Dan McGee | 2008-04-26 | 2 | -2/+8 |
| |/ / / / | |||||
* | | | | | Documentation: bisect: add a few "git bisect run" examples | Christian Couder | 2008-05-08 | 1 | -0/+49 |
* | | | | | Documentation/config.txt: Add git-gui options | Gustaf Hendeby | 2008-05-08 | 1 | -0/+30 |
* | | | | | Documentation: improve "add", "pull" and "format-patch" examples | Christian Couder | 2008-05-06 | 3 | -69/+108 |
* | | | | | Merge branch 'bc/filter-branch' | Junio C Hamano | 2008-05-05 | 1 | -4/+10 |
|\ \ \ \ \ | |||||
| * | | | | | filter-branch.sh: support nearly proper tag name filtering | Brandon Casey | 2008-03-31 | 1 | -4/+10 |
* | | | | | | Merge branch 'lh/git-file' | Junio C Hamano | 2008-05-05 | 1 | -1/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add platform-independent .git "symlink" | Lars Hjemli | 2008-04-09 | 1 | -1/+4 |
* | | | | | | | Merge branch 'lh/branch-merged' | Junio C Hamano | 2008-05-05 | 1 | -1/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-branch.txt: compare --contains, --merged and --no-merged | Lars Hjemli | 2008-04-20 | 1 | -0/+21 |
| * | | | | | | | git-branch: add support for --merged and --no-merged | Lars Hjemli | 2008-04-20 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'pb/remote-mirror-config' | Junio C Hamano | 2008-05-05 | 3 | -3/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add a remote.*.mirror configuration option | Paolo Bonzini | 2008-04-20 | 3 | -3/+11 |
| |/ / / / / / / | |||||
* | | | | | | | | post-merge: Add it's not executed if merge failed. | Jörg Sommer | 2008-05-05 | 1 | -1/+2 |
* | | | | | | | | Documentation: Add create-ignore to git svn manual | Gustaf Hendeby | 2008-05-05 | 1 | -0/+6 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-05-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-05-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | filter-branch: Documentation fix. | Florian Ragwitz | 2008-05-03 | 1 | -2/+2 |
* | | | | | | | | Documentation: hooks: fix missing verb in pre-applypatch description | Christian Couder | 2008-05-03 | 1 | -4/+5 |
* | | | | | | | | Documentation: point git-prune users to git-gc | Jeff King | 2008-04-29 | 2 | -1/+22 |
* | | | | | | | | Documentation on --git-dir and --work-tree | Liu Yubao | 2008-04-29 | 2 | -3/+15 |
* | | | | | | | | Documentation gitk: Describe what --merge does | Richard Quirk | 2008-04-29 | 1 | -0/+6 |
* | | | | | | | | Add otherwise missing --strict option to unpack-objects summary. | Jon Loeliger | 2008-04-29 | 1 | -1/+1 |
* | | | | | | | | git checkout: add -t alias for --track | Miklos Vajna | 2008-04-27 | 1 | -1/+1 |
* | | | | | | | | rev-parse: teach "--verify" to be quiet when using "-q" or "--quiet" | Christian Couder | 2008-04-26 | 1 | -0/+5 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge branch 'ho/shared' | Junio C Hamano | 2008-04-25 | 2 | -2/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make core.sharedRepository more generic | Heikki Orsila | 2008-04-16 | 2 | -2/+13 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-24 | 2 | -1/+17 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-24 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Linked glossary from cvs-migration page | Matt Graham | 2008-04-23 | 1 | -1/+2 |
| * | | | | | | | doc/git-gc: add a note about what is collected | Jeff King | 2008-04-24 | 1 | -0/+15 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-04-23 | 5 | -35/+27 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'maint-1.5.4' into maint | Junio C Hamano | 2008-04-22 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | diff options documentation: refer to --diff-filter in --name-status | Miklos Vajna | 2008-04-22 | 1 | -1/+2 |