Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-12 | 2 | -2/+12 |
|\ | |||||
| * | Update draft release notes to 1.7.6.6 | Junio C Hamano | 2012-01-12 | 1 | -0/+5 |
| * | thin-pack: try harder to use preferred base objects as base | Jeff King | 2012-01-12 | 1 | -2/+7 |
* | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-11 | 2 | -1/+2 |
|\ \ | |/ | |||||
| * | attr: fix leak in free_attr_elem | Jeff King | 2012-01-11 | 1 | -0/+1 |
| * | t2203: fix wrong commit command | Nguyễn Thái Ngọc Duy | 2012-01-11 | 1 | -1/+1 |
* | | Prepare for 1.7.7.6 | Junio C Hamano | 2012-01-10 | 2 | -1/+12 |
* | | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 | 4 | -33/+66 |
|\ \ | |/ | |||||
| * | Prepare for 1.7.6.6 | Junio C Hamano | 2012-01-10 | 2 | -1/+12 |
| * | Documentation: rerere's rr-cache auto-creation and rerere.enabled | Junio C Hamano | 2012-01-10 | 1 | -1/+2 |
| * | attr.c: clarify the logic to pop attr_stack | Junio C Hamano | 2012-01-10 | 1 | -1/+10 |
| * | attr.c: make bootstrap_attr_stack() leave early | Junio C Hamano | 2012-01-10 | 1 | -30/+31 |
| * | attr: drop misguided defensive coding | Jeff King | 2012-01-10 | 1 | -1/+1 |
| * | attr: don't confuse prefixes with leading directories | Jeff King | 2012-01-10 | 2 | -1/+12 |
* | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-06 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Documentation: rerere.enabled is the primary way to configure rerere | Thomas Rast | 2012-01-06 | 1 | -4/+4 |
* | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-03 | 2 | -5/+5 |
|\ \ | |/ | |||||
| * | Documentation: read-tree --prefix works with existing subtrees | Clemens Buchacher | 2012-01-01 | 1 | -5/+4 |
| * | Add MYMETA.json to perl/.gitignore | Jack Nagel | 2011-12-29 | 1 | -0/+1 |
* | | docs: describe behavior of relative submodule URLs | Jens Lehmann | 2012-01-03 | 1 | -1/+6 |
* | | Git 1.7.7.5v1.7.7.5 | Junio C Hamano | 2011-12-13 | 4 | -3/+21 |
* | | Merge branch 'ab/clang-lints' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 3 | -5/+2 |
|\ \ | |||||
| * | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lints | Ævar Arnfjörð Bjarmason | 2011-11-06 | 2 | -2/+2 |
| * | | apply: get rid of useless x < 0 comparison on a size_t type | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -3/+0 |
* | | | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-exclude | Nguyễn Thái Ngọc Duy | 2011-11-28 | 2 | -2/+2 |
* | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2011-12-13 | 4 | -40/+78 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Git 1.7.6.5v1.7.6.5 | Junio C Hamano | 2011-12-13 | 4 | -3/+30 |
| * | | | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -38/+49 |
| |\ \ \ | |||||
| | * | | | fetch: create status table using strbufjk/maint-fetch-status-table | Jeff King | 2011-12-09 | 1 | -38/+49 |
| * | | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ml/mailmap' into maint-1.7.6 | Junio C Hamano | 2011-12-13 | 1 | -3/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | blame: don't overflow time buffer | Jeff King | 2011-12-13 | 1 | -1/+1 |
* | | | | | | | am: don't persist keepcr flag | Martin von Zweigbergk | 2011-12-09 | 1 | -7/+0 |
* | | | | | | | mingw: give waitpid the correct signature | Erik Faye-Lund | 2011-12-09 | 2 | -2/+2 |
* | | | | | | | git symbolic-ref: documentation fix | Michael Haggerty | 2011-12-08 | 1 | -6/+3 |
* | | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2011-12-05 | 2 | -2/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | stripspace: fix outdated comment | Jeff King | 2011-12-05 | 1 | -2/+0 |
| * | | | | | | Add MYMETA.yml to perl/.gitignore | Sebastian Morr | 2011-12-05 | 1 | -0/+1 |
* | | | | | | | documentation fix: git difftool uses diff tools, not merge tools. | Thomas Hochstein | 2011-11-21 | 1 | -1/+1 |
* | | | | | | | Git 1.7.7.4v1.7.7.4 | Junio C Hamano | 2011-11-18 | 3 | -2/+16 |
* | | | | | | | Merge branch 'jc/maint-name-rev-all' into maint | Junio C Hamano | 2011-11-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | name-rev --all: do not even attempt to describe non-commit objectjc/maint-name-rev-all | Junio C Hamano | 2011-11-15 | 1 | -1/+1 |
* | | | | | | | Merge branch 'ml/mailmap' into maint | Junio C Hamano | 2011-11-18 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | mailmap: xcalloc mailmap_infoml/mailmap | Marc-André Lureau | 2011-11-16 | 1 | -3/+2 |
* | | | | | | | Merge branch 'jn/maint-notes-avoid-va-args' into maint | Junio C Hamano | 2011-11-18 | 1 | -43/+61 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-args | Jonathan Nieder | 2011-11-17 | 1 | -43/+61 |
* | | | | | | | | Makefile: add missing header file dependencies | Jonathan Nieder | 2011-11-18 | 1 | -2/+3 |
* | | | | | | | | Git 1.7.7.3v1.7.7.3 | Junio C Hamano | 2011-11-08 | 3 | -2/+21 |
* | | | | | | | | Merge branch 'jc/maint-remove-renamed-ref' into maint | Junio C Hamano | 2011-11-08 | 1 | -8/+0 |
|\ \ \ \ \ \ \ \ |