Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync with maint | Junio C Hamano | 2011-10-21 | 2 | -24/+20 |
|\ | |||||
| * | Almost ready for 1.7.7.1 | Junio C Hamano | 2011-10-21 | 1 | -0/+20 |
| * | Merge branch 'rs/diff-cleanup-records-fix' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+4 |
| |\ | |||||
* | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-19 | 1 | -2/+22 |
* | | | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-10-19 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 | 1 | -0/+6 |
* | | | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'jn/gitweb-manpages' | Junio C Hamano | 2011-10-18 | 5 | -2/+1611 |
|\ \ \ \ | |||||
| * | | | | Documentation: Add gitweb config variables to git-config(1) | Jakub Narebski | 2011-10-16 | 1 | -0/+17 |
| * | | | | Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages | Jakub Narebski | 2011-10-16 | 1 | -0/+4 |
| * | | | | gitweb: Add gitweb(1) manpage for gitweb itself | Jakub Narebski | 2011-10-16 | 3 | -1/+714 |
| * | | | | gitweb: Add gitweb.conf(5) manpage for gitweb configuration files | Drew Northup | 2011-10-16 | 2 | -1/+876 |
| |/ / / | |||||
* | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-17 | 1 | -1/+37 |
* | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-16 | 1 | -1/+3 |
* | | | | git svn dcommit: new option --interactive. | Frédéric Heitzmann | 2011-10-16 | 1 | -0/+8 |
* | | | | Sync with maint | Junio C Hamano | 2011-10-15 | 2 | -41/+39 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Prepare for 1.7.7.1 | Junio C Hamano | 2011-10-15 | 1 | -0/+39 |
| |/ / | |||||
* | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-13 | 1 | -1/+40 |
* | | | Merge branch 'jn/ident-from-etc-mailname' | Junio C Hamano | 2011-10-13 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | ident: check /etc/mailname if email is unknown | Jonathan Nieder | 2011-10-03 | 1 | -1/+7 |
* | | | | Merge branch 'jc/grep-untracked-exclude' | Junio C Hamano | 2011-10-13 | 1 | -2/+15 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude | Junio C Hamano | 2011-10-04 | 1 | -2/+15 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | grep: teach --untracked and --exclude-standard options | Junio C Hamano | 2011-10-04 | 1 | -1/+14 |
* | | | | | Merge branch 'rs/diff-cleanup-records-fix' | Junio C Hamano | 2011-10-13 | 1 | -0/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | diff: resurrect XDF_NEED_MINIMAL with --minimal | Junio C Hamano | 2011-10-03 | 1 | -0/+4 |
* | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-12 | 1 | -1/+12 |
* | | | | | Merge branch 'cb/do-not-pretend-to-hijack-long-help' | Junio C Hamano | 2011-10-12 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | use -h for synopsis and --help for manpage consistentlycb/do-not-pretend-to-hijack-long-help | Clemens Buchacher | 2011-10-05 | 1 | -1/+0 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'nd/document-err-packet' | Junio C Hamano | 2011-10-12 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | pack-protocol: document "ERR" linend/document-err-packet | Nguyen Thai Ngoc Duy | 2011-10-03 | 1 | -0/+7 |
* | | | | | | Merge branch 'jc/parse-options-boolean' | Junio C Hamano | 2011-10-12 | 1 | -5/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | parseopt: add OPT_NOOP_NOARG | René Scharfe | 2011-09-28 | 1 | -0/+5 |
| * | | | | | | parse-options: deprecate OPT_BOOLEAN | Junio C Hamano | 2011-09-27 | 1 | -5/+11 |
* | | | | | | | Update draft release notes to 1.7.8 | Junio C Hamano | 2011-10-10 | 1 | -6/+44 |
* | | | | | | | Merge branch 'nd/sparse-doc' | Junio C Hamano | 2011-10-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-read-tree.txt: update sparse checkout examples | Nguyễn Thái Ngọc Duy | 2011-09-26 | 1 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'mh/check-ref-format-3' | Junio C Hamano | 2011-10-10 | 1 | -13/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change check_refname_format() to reject unnormalized refnames | Michael Haggerty | 2011-10-05 | 1 | -8/+18 |
| * | | | | | | | Do not allow ".lock" at the end of any refname component | Michael Haggerty | 2011-10-05 | 1 | -3/+1 |
| * | | | | | | | git check-ref-format: add options --allow-onelevel and --refspec-pattern | Michael Haggerty | 2011-10-05 | 1 | -5/+24 |
* | | | | | | | | Merge branch 'jm/mergetool-pathspec' | Junio C Hamano | 2011-10-10 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mergetool: Use args as pathspec to unmerged files | Jonathon Mah | 2011-09-26 | 1 | -3/+4 |
* | | | | | | | | | Merge branch 'hv/submodule-update-none' | Junio C Hamano | 2011-10-10 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add update 'none' flag to disable update of submodule by default | Heiko Voigt | 2011-08-11 | 1 | -1/+7 |
* | | | | | | | | | | Merge branch 'fg/submodule-git-file-git-dir' | Junio C Hamano | 2011-10-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rev-parse: add option --resolve-git-dir <path> | Fredrik Gustafsson | 2011-08-16 | 1 | -0/+4 |
* | | | | | | | | | | | Post 1.7.7 first wave | Junio C Hamano | 2011-10-05 | 1 | -0/+107 |
* | | | | | | | | | | | Merge branch 'js/check-attr-cached' | Junio C Hamano | 2011-10-05 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Teach '--cached' option to check-attr | Jay Soffian | 2011-09-22 | 1 | -0/+3 |