summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test: commit --amend should honor --no-editjc/commit-amend-no-editJonathan Nieder2011-12-081-0/+40
* commit: honour --no-editJunio C Hamano2011-12-081-4/+5
* t7501 (commit): modernize styleJonathan Nieder2011-12-081-133/+127
* test: remove a porcelain test that hard-codes commit namesJonathan Nieder2011-12-081-20/+0
* test: add missing "&&" after echo commandJonathan Nieder2011-12-081-6/+7
* 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
| * | | | convert: don't mix enum with intRamkumar Ramachandra2011-11-151-3/+3
| * | | | http: remove unused function hex()Ramkumar Ramachandra2011-11-151-8/+0
* | | | | Makefile: add option to disable automatic dependency generationJonathan Nieder2011-11-181-7/+24
* | | | | Sync with 1.7.7.4Junio C Hamano2011-11-185-49/+81
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Git 1.7.7.4v1.7.7.4Junio C Hamano2011-11-183-2/+16
| * | | | Merge branch 'jc/maint-name-rev-all' into maintJunio C Hamano2011-11-181-1/+1
| |\ \ \ \
| | * | | | name-rev --all: do not even attempt to describe non-commit objectjc/maint-name-rev-allJunio C Hamano2011-11-151-1/+1
| * | | | | Merge branch 'ml/mailmap' into maintJunio C Hamano2011-11-181-3/+2
| |\ \ \ \ \
| | * | | | | mailmap: xcalloc mailmap_infoml/mailmapMarc-André Lureau2011-11-161-3/+2
| * | | | | | Merge branch 'jn/maint-notes-avoid-va-args' into maintJunio C Hamano2011-11-181-43/+61
| |\ \ \ \ \ \
| | * | | | | | notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-argsJonathan Nieder2011-11-171-43/+61
| * | | | | | | Makefile: add missing header file dependenciesJonathan Nieder2011-11-181-2/+3
* | | | | | | | do not let git_path clobber errno when reporting errorsjn/git-path-errnoJonathan Nieder2011-11-172-24/+34
* | | | | | | | Git 1.7.8-rc3v1.7.8-rc3Junio C Hamano2011-11-172-5/+2