Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Junio C Hamano | 2008-03-11 | 1 | -0/+2 |
|\ | |||||
| * | git-pull documentation: warn about the option order | Junio C Hamano | 2008-03-10 | 1 | -0/+2 |
* | | update 'git rebase' documentation | SZEDER Gábor | 2008-03-10 | 1 | -2/+1 |
* | | Merge branch 'ph/parseopt' | Junio C Hamano | 2008-03-08 | 1 | -5/+12 |
|\ \ | |||||
| * | | parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt | Pierre Habouzit | 2008-03-02 | 1 | -5/+12 |
* | | | Merge branch 'ml/submodule-add-existing' | Junio C Hamano | 2008-03-08 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | git-submodule - Allow adding a submodule in-place | Mark Levedahl | 2008-03-05 | 1 | -2/+3 |
* | | | | Merge branch 'sp/fetch-optim' | Junio C Hamano | 2008-03-08 | 2 | -1/+12 |
|\ \ \ \ | |||||
| * | | | | Teach fetch-pack/upload-pack about --include-tag | Shawn O. Pearce | 2008-03-04 | 1 | -1/+7 |
| * | | | | git-pack-objects: Automatically pack annotated tags if object was packed | Shawn O. Pearce | 2008-03-04 | 1 | -0/+5 |
* | | | | | Merge branch 'jc/am' | Junio C Hamano | 2008-03-08 | 1 | -5/+1 |
|\ \ \ \ \ | |||||
| * | | | | | am: remove support for -d .dotest | Junio C Hamano | 2008-03-05 | 1 | -5/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'maint' to sync with 1.5.4.4 | Junio C Hamano | 2008-03-08 | 3 | -11/+28 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | GIT 1.5.4.4v1.5.4.4 | Junio C Hamano | 2008-03-08 | 1 | -6/+26 |
* | | | | | merge-tool documentation: describe custom command usage | Charles Bailey | 2008-03-08 | 1 | -0/+22 |
* | | | | | git-mergetool documentaiton: show toolnames in typewriter font | Charles Bailey | 2008-03-08 | 1 | -8/+8 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-07 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | config.txt: refer to --upload-pack and --receive-pack instead of --exec | Uwe Kleine-König | 2008-03-07 | 1 | -4/+4 |
* | | | | | Merge branch 'js/reflog-delete' | Junio C Hamano | 2008-03-07 | 2 | -1/+26 |
|\ \ \ \ \ | |||||
| * | | | | | git-reflog.txt: Document new commands --updateref and --rewrite | Brandon Casey | 2008-03-03 | 1 | -0/+9 |
| * | | | | | Merge commit '74359821' into js/reflog-delete | Junio C Hamano | 2008-03-03 | 18 | -54/+221 |
| |\ \ \ \ \ | |||||
| * | | | | | | git-stash: add new 'pop' subcommand | Brandon Casey | 2008-02-22 | 1 | -1/+7 |
| * | | | | | | git-stash: add new 'drop' subcommand | Brandon Casey | 2008-02-22 | 1 | -1/+6 |
| * | | | | | | Merge branch 'bc/reflog-fix' into js/reflog-delete | Junio C Hamano | 2008-02-22 | 208 | -2060/+5579 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Teach "git reflog" a subcommand to delete single entries | Johannes Schindelin | 2007-10-17 | 1 | -0/+5 |
* | | | | | | | | Merge branch 'dc/format-pretty' | Junio C Hamano | 2008-03-07 | 3 | -5/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | log/show/whatchanged: introduce format.pretty configuration | Denis Cheng | 2008-03-05 | 2 | -0/+8 |
| * | | | | | | | | whatchanged documentation: share description of --pretty with others | Denis Cheng | 2008-03-05 | 1 | -5/+4 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'cb/mergetool' | Junio C Hamano | 2008-03-07 | 1 | -2/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Teach git mergetool to use custom commands defined at config time | Charles Bailey | 2008-03-05 | 1 | -2/+23 |
| * | | | | | | | | Tidy up git mergetool's backup file behaviour | Charles Bailey | 2008-03-05 | 1 | -0/+6 |
| |/ / / / / / / | |||||
* | | | | | | | | run-command: Redirect stderr to a pipe before redirecting stdout to stderr | Christian Couder | 2008-03-05 | 1 | -3/+4 |
|/ / / / / / / | |||||
* | | | | | | | Revert "unpack-objects: prevent writing of inconsistent objects" | Junio C Hamano | 2008-03-04 | 1 | -3/+0 |
* | | | | | | | Revert "receive-pack: use strict mode for unpacking objects" | Junio C Hamano | 2008-03-04 | 1 | -6/+0 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix incorrect wording in git-merge.txt. | Matthieu Moy | 2008-03-03 | 1 | -1/+2 |
* | | | | | | Update draft release notes for 1.5.5 | Junio C Hamano | 2008-03-03 | 1 | -1/+27 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-03-02 | 1 | -1/+21 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Update draft release notes for 1.5.4.4 | Junio C Hamano | 2008-03-02 | 1 | -1/+21 |
* | | | | | | Fix doc typos. | Ralf Wildenhues | 2008-03-02 | 2 | -4/+4 |
* | | | | | | Merge branch 'np/verify-pack' | Junio C Hamano | 2008-03-02 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add storage size output to 'git verify-pack -v' | Nicolas Pitre | 2008-03-01 | 1 | -2/+2 |
* | | | | | | | Merge branch 'pb/cvsimport' | Junio C Hamano | 2008-03-02 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | cvsimport: document that -M can be used multiple times | Philippe Bruhat (BooK | 2008-03-01 | 1 | -1/+5 |
* | | | | | | | | Merge branch 'mk/maint-parse-careful' | Junio C Hamano | 2008-03-02 | 3 | -0/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | receive-pack: use strict mode for unpacking objects | Martin Koegler | 2008-02-28 | 1 | -0/+6 |
| * | | | | | | | | index-pack: introduce checking mode | Martin Koegler | 2008-02-28 | 1 | -0/+3 |
| * | | | | | | | | unpack-objects: prevent writing of inconsistent objects | Martin Koegler | 2008-02-28 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'sb/describe-long' | Junio C Hamano | 2008-03-02 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-describe: --long shows the object name even for a tagged commit | Santi Béjar | 2008-02-25 | 1 | -0/+9 |