Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix incorrect ref namespace checknd/maint-refname-in-hierarchy-check | Nguyễn Thái Ngọc Duy | 2012-01-11 | 3 | -4/+4 |
* | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-13 | 10 | -48/+101 |
|\ | |||||
| * | 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 |
* | | | | | | | | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-09 | 4 | -15/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 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.7' into maint | Junio C Hamano | 2011-12-05 | 2 | -2/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 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 |
* | | | | | | | | Merge branch 'js/merge-edit-option' | Junio C Hamano | 2011-12-05 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: fix formatting error in merge-options.txtjs/merge-edit-option | Jack Nagel | 2011-12-05 | 1 | -1/+0 |
* | | | | | | | | | Git 1.7.8v1.7.8 | Junio C Hamano | 2011-12-02 | 3 | -11/+8 |
* | | | | | | | | | Git 1.7.8-rc4v1.7.8-rc4 | Junio C Hamano | 2011-11-28 | 2 | -2/+2 |
* | | | | | | | | | builtin-reset: Documentation update | Vincent van Ravesteijn | 2011-11-23 | 1 | -4/+4 |
* | | | | | | | | | builtin-branch: Fix crash on invalid use of --force | Vincent van Ravesteijn | 2011-11-23 | 1 | -2/+2 |
* | | | | | | | | | revert --abort: do not leave behind useless sequencer-old directory | Jonathan Nieder | 2011-11-23 | 2 | -0/+9 |
* | | | | | | | | | Fix revert --abort on Windows | Johannes Sixt | 2011-11-23 | 1 | -2/+2 |
* | | | | | | | | | revert: do not pass non-literal string as format to git_path() | Nguyễn Thái Ngọc Duy | 2011-11-23 | 1 | -1/+1 |
* | | | | | | | | | Update 1.7.8 draft release notes in preparation for rc4 | Junio C Hamano | 2011-11-22 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jn/revert-quit' | Junio C Hamano | 2011-11-22 | 10 | -54/+314 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revert: remove --reset compatibility optionjn/revert-quit | Jonathan Nieder | 2011-11-22 | 2 | -5/+2 |
| * | | | | | | | | | revert: introduce --abort to cancel a failed cherry-pick | Jonathan Nieder | 2011-11-22 | 5 | -3/+185 |
| * | | | | | | | | | revert: write REVERT_HEAD pseudoref during conflicted revert | Jonathan Nieder | 2011-11-22 | 4 | -3/+61 |
| * | | | | | | | | | revert: improve error message for cherry-pick during cherry-pick | Jonathan Nieder | 2011-11-22 | 1 | -7/+6 |
| * | | | | | | | | | revert: rearrange pick_revisions() for clarity | Jonathan Nieder | 2011-11-22 | 1 | -24/+24 |
| * | | | | | | | | | revert: rename --reset option to --quit | Jonathan Nieder | 2011-11-22 | 7 | -25/+49 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-11-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | documentation fix: git difftool uses diff tools, not merge tools. | Thomas Hochstein | 2011-11-21 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rr/misc-fixes' | Junio C Hamano | 2011-11-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | convert.c: Fix return type of git_path_check_eol()rr/misc-fixes | Ramsay Jones | 2011-11-21 | 1 | -1/+1 |
* | | | | | | | | | | config.c: Fix a static buffer overwrite bug by avoiding mkpath() | Ramsay Jones | 2011-11-20 | 1 | -2/+2 |
* | | | | | | | | | | t5501-*.sh: Fix url passed to clone in setup test | Ramsay Jones | 2011-11-20 | 1 | -1/+1 |
* | | | | | | | | | | Hopefully final update of release notes before 1.7.8 final | Junio C Hamano | 2011-11-18 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'rr/misc-fixes' | Junio C Hamano | 2011-11-18 | 4 | -13/+5 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | git-compat-util: don't assume value for undefined variable | Ramkumar Ramachandra | 2011-11-15 | 1 | -1/+1 |
| * | | | | | | | | | sha1_file: don't mix enum with int | Ramkumar Ramachandra | 2011-11-15 | 1 | -1/+1 |