summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitattributes: drop support for GIT_ATTR_NOGLOBALJonathan Nieder2011-03-151-6/+1
* tests: suppress system gitattributesJonathan Nieder2011-03-151-1/+2
* tests: stop worrying about obsolete environment variablesJonathan Nieder2011-03-151-7/+0
* Merge branch 'sp/maint-smart-http-sans-100-continue'Junio C Hamano2011-03-141-1/+1
|\
| * smart-http: Really never use Expect: 100-continueShawn O. Pearce2011-03-141-1/+1
* | Documentation: "rebase <onto> <that>" stays on <that> branch upon exitDrew Northup2011-03-141-2/+3
* | object.h: Remove obsolete struct object_refsJakob Pfender2011-03-141-5/+0
* | Merge branch 'pw/p4'Junio C Hamano2011-03-132-1/+17
|\ \
| * | git-p4: test clone @allPete Wyckoff2011-03-131-0/+16
| * | git-p4: fix clone @all regressionPete Wyckoff2011-03-131-1/+1
* | | Merge branch 'maint'Junio C Hamano2011-03-105-21/+1
|\ \ \
| * | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"Junio C Hamano2011-03-105-21/+1
* | | | Update Release Notes to 1.7.5Junio C Hamano2011-03-091-3/+27
* | | | Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-0912-156/+308
|\ \ \ \
| * | | | Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-217-104/+158
| * | | | bash: teach __git_ps1 about CHERRY_PICK_HEADJay Soffian2011-02-211-0/+2
| * | | | Introduce CHERRY_PICK_HEADJay Soffian2011-02-217-4/+132
| * | | | t3507: introduce pristine-detach helperJonathan Nieder2011-02-211-54/+22
* | | | | Merge branch 'js/checkout-untracked-symlink'Junio C Hamano2011-03-093-4/+62
|\ \ \ \ \
| * | | | | do not overwrite untracked symlinksClemens Buchacher2011-02-212-4/+12
| * | | | | Demonstrate breakage: checkout overwrites untracked symlink with directoryJohannes Sixt2011-02-151-0/+50
| |/ / / /
* | | | | Merge branch 'so/submodule-no-update-first-time'Junio C Hamano2011-03-092-0/+61
|\ \ \ \ \
| * | | | | t7406: "git submodule update {--merge|--rebase]" with new submodulesSpencer E. Olson2011-02-171-0/+52
| * | | | | submodule: no [--merge|--rebase] when newly clonedSpencer E. Olson2011-02-171-0/+9
| |/ / / /
* | | | | Merge branch 'maint'Junio C Hamano2011-03-093-5/+17
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix typo in t/READMEMathias Lafeldt2011-03-091-1/+1
| * | | | ls-remote documentation: <refs> argument is optionalPiotr Krukowiecki2011-03-091-1/+1
| * | | | Add Author and Documentation sections to git-for-each-ref.txtAlexei Sholik2011-03-091-0/+12
| * | | | Documentation: remove redundant colons in git-for-each-ref.txtAlexei Sholik2011-03-091-3/+3
* | | | | Merge branch 'maint'Junio C Hamano2011-03-083-13/+26
|\ \ \ \ \ | |/ / / /
| * | | | SubmittingPatches: clarify the expected commit log descriptionJunio C Hamano2011-03-081-8/+18
| * | | | diff format documentation: clarify --cc and -cAdam Monsen2011-03-081-4/+7
| * | | | rev-list-options.txt: typo fixMichael J Gruber2011-03-081-1/+1
* | | | | transport-helper.c: fix check for (size_t < 0)Nicolas Kaiser2011-03-081-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2011-03-042-8/+6
|\ \ \ \ \ | |/ / / /
| * | | | Documentation: fix a typo in git-apply.txtMichał Kiedrowicz2011-03-041-1/+1
| * | | | init: remove unnecessary checkNguyễn Thái Ngọc Duy2011-03-031-7/+5
* | | | | Merge branch 'mh/p4'Junio C Hamano2011-03-041-1/+1
|\ \ \ \ \
| * | | | | git-p4 submit: prevent 'Jobs' section from being removed from p4 change logMichael Horowitz2011-02-251-1/+1
* | | | | | Merge branch 'mg/maint-difftool-vim-readonly'Junio C Hamano2011-03-041-2/+2
|\ \ \ \ \ \
| * | | | | | mergetool-lib: call vim in readonly mode for diffsMichael J Gruber2011-02-251-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jn/maint-commit-missing-template'Junio C Hamano2011-03-042-4/+12
|\ \ \ \ \ \
| * | | | | | commit: error out for missing commit message templateJonathan Nieder2011-02-252-4/+12
* | | | | | | Merge branch 'jk/diffstat-binary'Junio C Hamano2011-03-042-10/+28
|\ \ \ \ \ \ \
| * | | | | | | diff: don't retrieve binary blobs for diffstatJeff King2011-02-221-4/+11
| * | | | | | | diff: handle diffstat of rewritten binary filesJeff King2011-02-222-10/+21
* | | | | | | | Merge branch 'lt/rename-no-extra-copy-detection'Junio C Hamano2011-03-049-45/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-rename: improve estimate_similarity() heuristicsLinus Torvalds2011-02-181-1/+1
| * | | | | | | | diffcore-rename: properly honor the difference between -M and -CLinus Torvalds2011-02-186-33/+32
| * | | | | | | | for_each_hash: allow passing a 'void *data' pointer to callbackLinus Torvalds2011-02-184-11/+13
| | |_|/ / / / / | |/| | | | | |