Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Revert "Merge branch 'en/merge-recursive'" | Junio C Hamano | 2011-05-19 |
* | Makefile: sort TEST_PROGRAMS list | Jeff King | 2011-05-19 |
* | Update release notes to 1.7.6 | Junio C Hamano | 2011-05-16 |
* | Merge branch 'jc/convert' | Junio C Hamano | 2011-05-16 |
|\ | |||
| * | convert: make it harder to screw up adding a conversion attribute | Junio C Hamano | 2011-05-09 |
| * | convert: make it safer to add conversion attributes | Junio C Hamano | 2011-05-09 |
| * | convert: give saner names to crlf/eol variables, types and functions | Junio C Hamano | 2011-05-09 |
| * | convert: rename the "eol" global variable to "core_eol" | Junio C Hamano | 2011-05-09 |
* | | Merge branch 'ci/commit--interactive-atomic' | Junio C Hamano | 2011-05-16 |
|\ \ | |||
| * | | Test atomic git-commit --interactive | Conrad Irwin | 2011-05-10 |
| * | | Add commit to list of config.singlekey commands | Conrad Irwin | 2011-05-09 |
| * | | Add support for -p/--patch to git-commit | Conrad Irwin | 2011-05-09 |
| * | | Allow git commit --interactive with paths | Conrad Irwin | 2011-05-09 |
| * | | t7501.8: feed a meaningful command | Jeff King | 2011-05-09 |
| * | | Use a temporary index for git commit --interactive | Conrad Irwin | 2011-05-08 |
* | | | Merge branch 'sg/completion-updates' | Junio C Hamano | 2011-05-16 |
|\ \ \ | |||
| * \ \ | Merge branch 'fc/completion-zsh' into sg/completion-updates | Junio C Hamano | 2011-05-10 |
| |\ \ \ | |||
| | * | | | git-completion: fix regression in zsh support | Felipe Contreras | 2011-05-10 |
| * | | | | Revert "completion: don't declare 'local words' to make zsh happy" | Junio C Hamano | 2011-05-10 |
| * | | | | completion: move private shopt shim for zsh to __git_ namespace | Jonathan Nieder | 2011-05-08 |
| * | | | | completion: don't declare 'local words' to make zsh happy | SZEDER Gábor | 2011-04-28 |
* | | | | | Merge branch 'kk/maint-prefix-in-config-mak' | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ | |||
| * | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* | Johannes Sixt | 2011-05-09 |
| * | | | | | Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf... | Junio C Hamano | 2011-05-09 |
| * | | | | | Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir | Kacper Kornet | 2011-04-28 |
* | | | | | | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ \ | |||
| * | | | | | | tests: check git does not barf on merge.ff values for future versions of git | Jonathan Nieder | 2011-05-06 |
| * | | | | | | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 |
| * | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config | Junio C Hamano | 2011-05-06 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-16 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-16 |
| * | | | | | | | Merge branch 'jn/maint-format-patch-doc' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'ss/cherry-pick-x-doc' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'vr/merge-base-doc' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/fix-add-u-unmerged' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jn/gitweb-dependency' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | Documentation/git-fsck.txt: fix typo: unreadable -> unreachable | Jim Meyering | 2011-05-16 |
* | | | | | | | | | | | | | | | | Sync release notes for 1.7.6 to exclude what are in maintenance track | Junio C Hamano | 2011-05-15 |
* | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-15 |
| * | | | | | | | | | | | | | | | Merge branch 'cn/format-patch-quiet' into maint | Junio C Hamano | 2011-05-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/mergetool-submodules' into maint | Junio C Hamano | 2011-05-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/format-patch-quote-special-in-from' into maint | Junio C Hamano | 2011-05-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vh/git-svn-doc' into maint | Junio C Hamano | 2011-05-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | git_open_noatime(): drop unused parameter | Junio C Hamano | 2011-05-15 |
| * | | | | | | | | | | | | | | | | | | | sha1_file: typofix | Junio C Hamano | 2011-05-15 |