summaryrefslogtreecommitdiff
path: root/Documentation
Commit message (Expand)AuthorAgeFilesLines
* Documentation/git-prune.txt: document unpacked logicChris Frey2008-05-151-1/+4
* Merge branch 'maint'Junio C Hamano2008-05-141-3/+4
|\
| * Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-141-3/+4
| |\
| | * Documentation/git-describe.txt: make description more readableIan Hilt2008-05-141-3/+4
* | | Merge branch 'mv/format-cc'Junio C Hamano2008-05-141-0/+1
|\ \ \
| * | | git-format-patch: add a new format.cc configuration variableMiklos Vajna2008-04-291-0/+1
* | | | Merge branch 'cc/hooks-doc'Junio C Hamano2008-05-149-13/+28
|\ \ \ \
| * | | | Documentation: rename "hooks.txt" to "githooks.txt" and make it a man pageChristian Couder2008-05-049-13/+28
* | | | | Merge branch 'jk/renamelimit' (early part)Junio C Hamano2008-05-141-0/+5
|\ \ \ \ \
| * | | | | add merge.renamelimit config optionJeff King2008-05-031-0/+5
| * | | | | Merge commit 'sg/merge-options^' into jk/renamelimitJunio C Hamano2008-05-035-52/+67
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'gp/bisect-fix'Junio C Hamano2008-05-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-bisect.sh: don't accidentally override existing branch "bisect"Gerrit Pape2008-05-051-1/+1
* | | | | | | | Add svn-compatible "blame" output format to git-svnSteven Grimm2008-05-111-4/+11
* | | | | | | | git-format-patch: add --no-binary to omit binary changes in the patch.Caio Marcelo de Oliveira Filho2008-05-111-0/+6
* | | | | | | | Allow tracking branches to set up rebase by default.Dustin Sallings2008-05-111-0/+15
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-05-082-2/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-082-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"Dustin Sallings2008-05-081-1/+2
| | * | | | | doc: clarify definition of "update" for git-add -uJeff King2008-05-081-1/+3
* | | | | | | Merge branch 'sg/merge-options' (early part)Junio C Hamano2008-05-085-52/+67
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-121-0/+9
| * | | | | | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-122-6/+14
| * | | | | | add 'merge.stat' config variableSZEDER Gábor2008-04-122-1/+5
| * | | | | | merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-122-3/+7
| * | | | | | doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-123-43/+33
* | | | | | | Merge branch 'cc/help'Junio C Hamano2008-05-083-6/+84
|\ \ \ \ \ \ \
| * | | | | | | documentation: web--browse: add a note about konquerorChristian Couder2008-04-261-1/+23
| * | | | | | | documentation: help: add info about "man.<tool>.cmd" config varChristian Couder2008-04-262-5/+48
| * | | | | | | documentation: help: add "man.<tool>.path" config variableChristian Couder2008-04-262-0/+13
* | | | | | | | Merge branch 'dm/cherry-pick-s'Junio C Hamano2008-05-082-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow cherry-pick (and revert) to add signoff lineDan McGee2008-04-262-2/+8
| |/ / / / / / /
* | | | | | | | Documentation: bisect: add a few "git bisect run" examplesChristian Couder2008-05-081-0/+49
* | | | | | | | Documentation/config.txt: Add git-gui optionsGustaf Hendeby2008-05-081-0/+30
* | | | | | | | Documentation: improve "add", "pull" and "format-patch" examplesChristian Couder2008-05-063-69/+108
* | | | | | | | Merge branch 'bc/filter-branch'Junio C Hamano2008-05-051-4/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | filter-branch.sh: support nearly proper tag name filteringBrandon Casey2008-03-311-4/+10
* | | | | | | | | Merge branch 'lh/git-file'Junio C Hamano2008-05-051-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add platform-independent .git "symlink"Lars Hjemli2008-04-091-1/+4
* | | | | | | | | | Merge branch 'lh/branch-merged'Junio C Hamano2008-05-051-1/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-branch.txt: compare --contains, --merged and --no-mergedLars Hjemli2008-04-201-0/+21
| * | | | | | | | | | git-branch: add support for --merged and --no-mergedLars Hjemli2008-04-201-1/+3
* | | | | | | | | | | Merge branch 'pb/remote-mirror-config'Junio C Hamano2008-05-053-3/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a remote.*.mirror configuration optionPaolo Bonzini2008-04-203-3/+11
| |/ / / / / / / / / /
* | | | | | | | | | | post-merge: Add it's not executed if merge failed.Jörg Sommer2008-05-051-1/+2
* | | | | | | | | | | Documentation: Add create-ignore to git svn manualGustaf Hendeby2008-05-051-0/+6
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-05-031-2/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-05-031-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | filter-branch: Documentation fix.Florian Ragwitz2008-05-031-2/+2
* | | | | | | | | | Documentation: hooks: fix missing verb in pre-applypatch descriptionChristian Couder2008-05-031-4/+5
| |_|_|_|_|_|_|/ / |/| | | | | | | |