Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/show-ref-parse-options' | Junio C Hamano | 2009-07-06 | 1 | -8/+7 |
|\ | |||||
| * | show-ref: migrate to parse-options | Stephen Boyd | 2009-06-20 | 1 | -8/+7 |
* | | Merge branch 'uk/rev-parse-parse-opt' | Junio C Hamano | 2009-07-06 | 1 | -0/+5 |
|\ \ | |||||
| * | | parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse | Uwe Kleine-König | 2009-06-13 | 1 | -0/+5 |
* | | | Merge branch 'cc/bisect' | Junio C Hamano | 2009-07-01 | 1 | -3/+2 |
|\ \ \ | |||||
| * | | | Documentation: remove warning saying that "git bisect skip" may slow bisection | Christian Couder | 2009-06-13 | 1 | -3/+2 |
* | | | | Merge branch 'sb/quiet-porcelains' | Junio C Hamano | 2009-07-01 | 3 | -8/+17 |
|\ \ \ \ | |||||
| * | | | | stash: teach quiet option | Stephen Boyd | 2009-06-18 | 1 | -7/+8 |
| * | | | | am, rebase: teach quiet option | Stephen Boyd | 2009-06-18 | 2 | -1/+9 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-30 | 3 | -14/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Makes some cleanup/review in gittutorial | Thadeu Lima de Souza Cascardo | 2009-06-30 | 1 | -12/+12 |
| * | | | | | git-submodule documentation: fix foreach example | Miklos Vajna | 2009-06-30 | 2 | -2/+4 |
* | | | | | | git svn: Doc update for multiple branch and tag paths | Marc Branchaud | 2009-06-27 | 1 | -9/+35 |
* | | | | | | Add 'git svn reset' to unwind 'git svn fetch' | Ben Jackson | 2009-06-25 | 1 | -1/+58 |
* | | | | | | git-svn: let 'dcommit $rev' work on $rev instead of HEAD | Thomas Rast | 2009-06-25 | 1 | -2/+3 |
* | | | | | | Sync with 1.6.3.3 | Junio C Hamano | 2009-06-21 | 2 | -1/+40 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | GIT 1.6.3.3v1.6.3.3 | Junio C Hamano | 2009-06-21 | 1 | -0/+38 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-20 | 2 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'maint-1.6.2' into maint | Junio C Hamano | 2009-06-20 | 2 | -3/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2009-06-20 | 2 | -3/+3 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-06-20 | 2 | -3/+3 |
| | | |\ \ \ \ | |||||
| | | | * | | | | git-show-ref.txt: remove word and make consistent | Stephen Boyd | 2009-06-20 | 1 | -2/+2 |
| | | | * | | | | git-svn documentation: fix typo in 'rebase vs. pull/merge' section | Miklos Vajna | 2009-06-20 | 1 | -1/+1 |
* | | | | | | | | 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 |