summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-12-05Merge branch 'gh/userdiff-matlab'Libravatar Junio C Hamano7-1/+39
2011-12-05Merge branch 'nd/maint-ignore-exclude'Libravatar Junio C Hamano2-2/+2
2011-12-05Merge branch 'vr/git-merge-default-to-upstream'Libravatar Junio C Hamano1-3/+6
2011-12-05Merge branch 'jc/maint-pack-object-cycle'Libravatar Junio C Hamano1-12/+43
2011-12-05Merge branch 'jc/index-pack-reject-dups'Libravatar Junio C Hamano4-2/+11
2011-12-05Merge branch 'vr/msvc'Libravatar Junio C Hamano14-19/+7
2011-12-05Merge branch 'na/strtoimax'Libravatar Junio C Hamano4-13/+46
2011-12-05Merge branch 'ab/clang-lints'Libravatar Junio C Hamano3-5/+2
2011-12-05Merge branch 'nd/prune-progress'Libravatar Junio C Hamano5-17/+60
2011-12-05Merge branch 'nd/fsck-progress'Libravatar Junio C Hamano4-27/+96
2011-12-05Merge branch 'mf/curl-select-fdset'Libravatar Junio C Hamano2-27/+21
2011-12-05Merge branch 'nd/misc-cleanups'Libravatar Junio C Hamano10-95/+112
2011-12-05Merge branch 'maint'Libravatar Junio C Hamano2-2/+1
2011-12-05Merge branch 'maint-1.7.7' into maintLibravatar Junio C Hamano2-2/+1
2011-12-05Merge branch 'maint-1.7.6' into maint-1.7.7Libravatar Junio C Hamano2-2/+1
2011-12-05stripspace: fix outdated commentLibravatar Jeff King1-2/+0
2011-12-05git-p4: introduce skipSubmitEditLibravatar Pete Wyckoff3-24/+136
2011-12-05Add MYMETA.yml to perl/.gitignoreLibravatar Sebastian Morr1-0/+1
2011-12-05Merge branch 'js/merge-edit-option'Libravatar Junio C Hamano1-1/+0
2011-12-05Documentation: fix formatting error in merge-options.txtLibravatar Jack Nagel1-1/+0
2011-12-02Git 1.7.8Libravatar Junio C Hamano3-11/+8
2011-11-28Git 1.7.8-rc4Libravatar Junio C Hamano2-2/+2
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeLibravatar Nguyễn Thái Ngọc Duy2-2/+2
2011-11-23builtin-reset: Documentation updateLibravatar Vincent van Ravesteijn1-4/+4
2011-11-23builtin-branch: Fix crash on invalid use of --forceLibravatar Vincent van Ravesteijn1-2/+2
2011-11-23revert --abort: do not leave behind useless sequencer-old directoryLibravatar Jonathan Nieder2-0/+9
2011-11-23Fix revert --abort on WindowsLibravatar Johannes Sixt1-2/+2
2011-11-23revert: do not pass non-literal string as format to git_path()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2011-11-22Update 1.7.8 draft release notes in preparation for rc4Libravatar Junio C Hamano1-1/+1
2011-11-22Merge branch 'jn/revert-quit'Libravatar Junio C Hamano10-54/+314
2011-11-22revert: remove --reset compatibility optionLibravatar Jonathan Nieder2-5/+2
2011-11-22revert: introduce --abort to cancel a failed cherry-pickLibravatar Jonathan Nieder5-3/+185
2011-11-22revert: write REVERT_HEAD pseudoref during conflicted revertLibravatar Jonathan Nieder4-3/+61
2011-11-22revert: improve error message for cherry-pick during cherry-pickLibravatar Jonathan Nieder1-7/+6
2011-11-22revert: rearrange pick_revisions() for clarityLibravatar Jonathan Nieder1-24/+24
2011-11-22revert: rename --reset option to --quitLibravatar Jonathan Nieder7-25/+49
2011-11-21Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2011-11-21Merge branch 'rr/misc-fixes'Libravatar Junio C Hamano1-1/+1
2011-11-21convert.c: Fix return type of git_path_check_eol()Libravatar Ramsay Jones1-1/+1
2011-11-21Show error for 'git merge' with unset merge.defaultToUpstreamLibravatar Vincent van Ravesteijn1-3/+6
2011-11-21documentation fix: git difftool uses diff tools, not merge tools.Libravatar Thomas Hochstein1-1/+1
2011-11-20config.c: Fix a static buffer overwrite bug by avoiding mkpath()Libravatar Ramsay Jones1-2/+2
2011-11-20t5501-*.sh: Fix url passed to clone in setup testLibravatar Ramsay Jones1-1/+1
2011-11-18Hopefully final update of release notes before 1.7.8 finalLibravatar Junio C Hamano1-1/+1
2011-11-18Merge branch 'rr/misc-fixes'Libravatar Junio C Hamano4-13/+5
2011-11-18Makefile: add option to disable automatic dependency generationLibravatar Jonathan Nieder1-7/+24
2011-11-18Sync with 1.7.7.4Libravatar Junio C Hamano5-49/+81
2011-11-18Git 1.7.7.4Libravatar Junio C Hamano3-2/+16
2011-11-18Merge branch 'jc/maint-name-rev-all' into maintLibravatar Junio C Hamano1-1/+1
2011-11-18Merge branch 'ml/mailmap' into maintLibravatar Junio C Hamano1-3/+2