summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix incorrect ref namespace checknd/maint-refname-in-hierarchy-checkNguyễn Thái Ngọc Duy2012-01-113-4/+4
* Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-1310-48/+101
|\
| * Git 1.7.7.5v1.7.7.5Junio C Hamano2011-12-134-3/+21
| * Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano2011-12-133-5/+2
| |\
| | * cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-062-2/+2
| | * apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-061-3/+0
| * | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-132-2/+2
| |\ \
| | * | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-excludeNguyễn Thái Ngọc Duy2011-11-282-2/+2
| * | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-134-40/+78
| |\ \ \
| | * | | Git 1.7.6.5v1.7.6.5Junio C Hamano2011-12-134-3/+30
| | * | | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
| | |\ \ \
| | | * | | fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
| | * | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano2011-12-131-3/+2
| | |\ \ \ \ \
| | * | | | | | blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | | | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-094-15/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am: don't persist keepcr flagMartin von Zweigbergk2011-12-091-7/+0
| * | | | | | | mingw: give waitpid the correct signatureErik Faye-Lund2011-12-092-2/+2
| * | | | | | | git symbolic-ref: documentation fixMichael Haggerty2011-12-081-6/+3
* | | | | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-052-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-052-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | stripspace: fix outdated commentJeff King2011-12-051-2/+0
| | * | | | | | Add MYMETA.yml to perl/.gitignoreSebastian Morr2011-12-051-0/+1
* | | | | | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-12-051-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: fix formatting error in merge-options.txtjs/merge-edit-optionJack Nagel2011-12-051-1/+0
* | | | | | | | | Git 1.7.8v1.7.8Junio C Hamano2011-12-023-11/+8
* | | | | | | | | Git 1.7.8-rc4v1.7.8-rc4Junio C Hamano2011-11-282-2/+2
* | | | | | | | | builtin-reset: Documentation updateVincent van Ravesteijn2011-11-231-4/+4
* | | | | | | | | builtin-branch: Fix crash on invalid use of --forceVincent van Ravesteijn2011-11-231-2/+2
* | | | | | | | | revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2011-11-232-0/+9
* | | | | | | | | Fix revert --abort on WindowsJohannes Sixt2011-11-231-2/+2
* | | | | | | | | revert: do not pass non-literal string as format to git_path()Nguyễn Thái Ngọc Duy2011-11-231-1/+1
* | | | | | | | | Update 1.7.8 draft release notes in preparation for rc4Junio C Hamano2011-11-221-1/+1
* | | | | | | | | Merge branch 'jn/revert-quit'Junio C Hamano2011-11-2210-54/+314
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revert: remove --reset compatibility optionjn/revert-quitJonathan Nieder2011-11-222-5/+2
| * | | | | | | | | revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-225-3/+185
| * | | | | | | | | revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-224-3/+61
| * | | | | | | | | revert: improve error message for cherry-pick during cherry-pickJonathan Nieder2011-11-221-7/+6
| * | | | | | | | | revert: rearrange pick_revisions() for clarityJonathan Nieder2011-11-221-24/+24
| * | | | | | | | | revert: rename --reset option to --quitJonathan Nieder2011-11-227-25/+49
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-11-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein2011-11-211-1/+1
* | | | | | | | | Merge branch 'rr/misc-fixes'Junio C Hamano2011-11-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | convert.c: Fix return type of git_path_check_eol()rr/misc-fixesRamsay Jones2011-11-211-1/+1
* | | | | | | | | | config.c: Fix a static buffer overwrite bug by avoiding mkpath()Ramsay Jones2011-11-201-2/+2
* | | | | | | | | | t5501-*.sh: Fix url passed to clone in setup testRamsay Jones2011-11-201-1/+1
* | | | | | | | | | Hopefully final update of release notes before 1.7.8 finalJunio C Hamano2011-11-181-1/+1
* | | | | | | | | | Merge branch 'rr/misc-fixes'Junio C Hamano2011-11-184-13/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | git-compat-util: don't assume value for undefined variableRamkumar Ramachandra2011-11-151-1/+1
| * | | | | | | | | sha1_file: don't mix enum with intRamkumar Ramachandra2011-11-151-1/+1