Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ph/submodule-rebase' | Junio C Hamano | 2009-06-20 | 2 | -4/+17 |
|\ | |||||
| * | git-submodule: add support for --merge. | Johan Herland | 2009-06-03 | 2 | -4/+17 |
* | | Merge branch 'mg/pushurl' | Junio C Hamano | 2009-06-20 | 3 | -0/+10 |
|\ \ | |||||
| * | | technical/api-remote: Describe new struct remote member pushurl | Michael J Gruber | 2009-06-09 | 1 | -0/+4 |
| * | | Allow push and fetch urls to be different | Michael J Gruber | 2009-06-09 | 2 | -0/+6 |
* | | | Merge branch 'sb/pull-rebase' | Junio C Hamano | 2009-06-20 | 1 | -20/+0 |
|\ \ \ | |||||
| * | | | parse-remote: remove unused functions | Santi Béjar | 2009-06-11 | 1 | -20/+0 |
* | | | | Merge branch 'pb/send-email-cccmd-fix' | Junio C Hamano | 2009-06-20 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Test cccmd in t9001-send-email.sh and fix some bugs | Paolo Bonzini | 2009-06-18 | 1 | -2/+2 |
* | | | | | Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS worki... | Alex Bennée | 2009-06-18 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-13 | 1 | -33/+32 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'maint-1.6.2' into maint | Junio C Hamano | 2009-06-13 | 1 | -33/+32 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2009-06-13 | 1 | -33/+32 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-06-13 | 1 | -33/+32 |
| | | |\ \ \ \ | |||||
| | | | * | | | | git-rerere.txt: grammatical fixups and cleanups | Stephen Boyd | 2009-06-13 | 1 | -33/+32 |
* | | | | | | | | Merge branch 'mh/fix-send-email-threaded' | Junio C Hamano | 2009-06-13 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threaded | Junio C Hamano | 2009-06-12 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | doc/send-email: clarify the behavior of --in-reply-to with --no-thread | Markus Heidelberg | 2009-06-12 | 1 | -2/+3 |
| | |/ / / / / / / | |||||
* | | | | | | | | | Merge branch 'ph/submodule-rebase' (early part) | Junio C Hamano | 2009-06-13 | 2 | -2/+21 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Rename submodule.<name>.rebase to submodule.<name>.update | Johan Herland | 2009-06-03 | 2 | -4/+10 |
| * | | | | | | | | git-submodule: add support for --rebase. | Peter Hutterer | 2009-04-24 | 2 | -2/+15 |
* | | | | | | | | | Merge branch 'da/araxis-mergetool' | Junio C Hamano | 2009-06-13 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 | 3 | -3/+3 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-11 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Documentation: git-send-mail can take rev-list arg to drive format-patch | Paolo Bonzini | 2009-06-11 | 1 | -0/+4 |
* | | | | | | | | git-repack.txt: Clarify implications of -a for dumb protocols | Michael J Gruber | 2009-06-09 | 1 | -2/+5 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Documentation: mention 'git stash pop --index' option explicitly | SZEDER Gábor | 2009-06-09 | 1 | -8/+8 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-06 | 2 | -1/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Documentation: refer to gitworkflows(7) from tutorial and git(1) | Thomas Rast | 2009-06-06 | 2 | -1/+8 |
* | | | | | | | Documentation/git.txt: update links to release notes | Junio C Hamano | 2009-06-03 | 1 | -1/+6 |
* | | | | | | | Merge branch 'maint' to sync with 1.6.3.2 | Junio C Hamano | 2009-06-03 | 1 | -7/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | GIT 1.6.3.2v1.6.3.2 | Junio C Hamano | 2009-06-03 | 1 | -7/+5 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-03 | 1 | -14/+26 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Update draft release notes for 1.6.3.2 | Junio C Hamano | 2009-06-02 | 1 | -14/+26 |
| * | | | | | | Documentation: teach stash/pop workflow instead of stash/apply | Thomas Rast | 2009-05-28 | 2 | -16/+18 |
* | | | | | | | git-show-branch.txt: document --date-order option | Stephen Boyd | 2009-06-01 | 1 | -3/+9 |
* | | | | | | | Merge branch 'sb/opt-filename' | Junio C Hamano | 2009-05-31 | 1 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parse-opts: add OPT_FILENAME and transition builtins | Stephen Boyd | 2009-05-25 | 1 | -0/+5 |
| * | | | | | | | parse-opts: prepare for OPT_FILENAME | Stephen Boyd | 2009-05-25 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'jc/mktree' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 1 | -3/+16 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'jc/mktree' | Junio C Hamano | 2009-05-31 | 1 | -3/+16 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | mktree --batch: build more than one tree object | Josh Micich | 2009-05-16 | 1 | -1/+7 |
| * | | | | | | | | mktree --missing: updated usage message and man page | Josh Micich | 2009-05-16 | 1 | -3/+10 |
* | | | | | | | | | Merge branch 'mw/send-email' | Junio C Hamano | 2009-05-31 | 1 | -12/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Docs: send-email: --smtp-server-port can take symbolic ports | Michael Witten | 2009-04-14 | 1 | -1/+3 |
| * | | | | | | | | | Docs: send-email: Refer to CONFIGURATION section for sendemail.multiedit | Michael Witten | 2009-04-14 | 1 | -3/+4 |
| * | | | | | | | | | Docs: send-email: Put options back into alphabetical order | Michael Witten | 2009-04-14 | 1 | -11/+11 |
* | | | | | | | | | | config.txt: document add.ignore-errors | Stephen Boyd | 2009-05-31 | 1 | -0/+5 |
* | | | | | | | | | | git-apply(1): Clarify that one can select where to apply the patch | Björn Steinbrink | 2009-05-31 | 1 | -1/+1 |
* | | | | | | | | | | Documentation: teach stash/pop workflow instead of stash/apply | Thomas Rast | 2009-05-30 | 2 | -16/+18 |