aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ss/howto-manage-trunk'Junio C Hamano2014-06-06
|\
| * How to keep a project's canonical history correct.Stephen P. Smith2014-05-28
* | Merge branch 'mc/git-p4-prepare-p4-only'Junio C Hamano2014-06-06
|\ \
| * | git-p4: Do not include diff in spec file when just preparing p4Maxime Coste2014-05-27
* | | Merge branch 'jn/test-lint-unmoor'Junio C Hamano2014-06-06
|\ \ \
| * | | test-lint: find unportable sed, echo, test, and export usage after &&Jonathan Nieder2014-05-23
* | | | Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-06
|\ \ \ \
| * | | | scripts: more "export VAR=VALUE" fixesJunio C Hamano2014-05-23
| * | | | scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-23
| |/ / /
* | | | Merge branch 'jj/command-line-adjective'Junio C Hamano2014-06-06
|\ \ \ \
| * | | | Documentation: use "command-line" when used as a compound adjective, and fix ...Jason St. John2014-05-21
* | | | | Merge branch 'jc/coding-guidelines'Junio C Hamano2014-06-06
|\ \ \ \ \
| * | | | | CodingGuidelines: avoid "test <cond> -a/-o <cond>"Junio C Hamano2014-05-20
| * | | | | CodingGuidelines: on splitting a long lineJunio C Hamano2014-05-02
| * | | | | CodingGuidelines: on comparisonJunio C Hamano2014-05-02
| * | | | | CodingGuidelines: do not call the conditional statement "if()"Junio C Hamano2014-05-02
| * | | | | CodingGuidelines: give an example for shell function preambleJunio C Hamano2014-05-02
| * | | | | CodingGuidelines: give an example for control statementsJunio C Hamano2014-05-02
| * | | | | CodingGuidelines: give an example for redirectionJunio C Hamano2014-05-02
| * | | | | CodingGuidelines: give an example for case/esac statementJunio C Hamano2014-05-02
| * | | | | CodingGuidelines: once it is in, it is not worth the code churnJunio C Hamano2014-05-02
* | | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-06
|\ \ \ \ \ \
| * | | | | | commit: allow core.commentChar=auto for character auto selectionNguyễn Thái Ngọc Duy2014-05-19
| * | | | | | config: be strict on core.commentCharNguyễn Thái Ngọc Duy2014-05-19
* | | | | | | Merge branch 'mt/rebase-i-keep-empty-test'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | rebase --keep-empty -i: add testMichael S. Tsirkin2014-05-19
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov2014-05-15
| |/ / / / / /
* | | | | | | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | git grep -O -i: if the pager is 'less', pass the '-I' optionJohannes Schindelin2014-05-15
| |/ / / / / /
* | | | | | | Merge branch 'jd/subtree'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | contrib/subtree: allow adding an annotated tagJames Denholm2014-05-13
| * | | | | | | contrib/subtree/Makefile: clean up rule for "clean"James Denholm2014-05-06
| * | | | | | | contrib/subtree/Makefile: clean up rules to generate documentationJames Denholm2014-05-06
| * | | | | | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/James Denholm2014-05-06
| * | | | | | | contrib/subtree/Makefile: use GIT-VERSION-FILEJames Denholm2014-05-06
| * | | | | | | contrib/subtree/Makefile: scrap unused $(gitdir)James Denholm2014-05-06
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'wk/doc-clarify-upstream'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \
| * | | | | | | Documentation: mention config sources for @{upstream}W. Trevor King2014-05-13
* | | | | | | | Merge branch 'tb/unicode-6.3-zero-width'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \ \
| * | | | | | | | utf8: make it easier to auto-update git_wcwidth()Torsten Bögershausen2014-05-12
| * | | | | | | | utf8.c: use a table for double_widthTorsten Bögershausen2014-05-12
* | | | | | | | | Merge branch 'jk/index-pack-report-missing'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | index-pack: distinguish missing objects from type errorsJeff King2014-05-12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/blame-crlf-test'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | blame: correctly handle files regardless of autocrlfbrian m. carlson2014-05-08
* | | | | | | | | | Merge branch 'sk/submodules-absolute-path-on-windows'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "submodules: fix ambiguous absolute paths under Windows"Stepan Kasal2014-05-08
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dk/blame-reorg'Junio C Hamano2014-06-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | blame: large-scale performance rewriteDavid Kastrup2014-04-28