summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveLibravatar Junio C Hamano2-4/+22
2011-11-21archive: don't let remote clients get unreachable commitsLibravatar Jeff King5-8/+27
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-18refresh_index: make porcelain output more specificLibravatar Jeff King1-2/+21
2011-11-18refresh_index: rename format variablesLibravatar Jeff King1-6/+6
2011-11-18read-cache: let refresh_cache_ent pass up changed flagsLibravatar Jeff King1-3/+6
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
2011-11-18Merge branch 'jn/maint-notes-avoid-va-args' into maintLibravatar Junio C Hamano1-43/+61
2011-11-18Makefile: add missing header file dependenciesLibravatar Jonathan Nieder1-2/+3
2011-11-17notes merge: eliminate OUTPUT macroLibravatar Jonathan Nieder1-43/+61
2011-11-17do not let git_path clobber errno when reporting errorsLibravatar Jonathan Nieder2-24/+34
2011-11-17Git 1.7.8-rc3Libravatar Junio C Hamano2-5/+2
2011-11-16pack-object: tolerate broken packs that have duplicated objectsLibravatar Junio C Hamano1-12/+43
2011-11-16receive-pack, fetch-pack: reject bogus pack that records objects twiceLibravatar Junio C Hamano4-2/+11
2011-11-16refs: loosen over-strict "format" checkLibravatar Junio C Hamano2-10/+17
2011-11-16mailmap: xcalloc mailmap_infoLibravatar Marc-André Lureau1-3/+2
2011-11-15revert: prettify fatal messagesLibravatar Ramkumar Ramachandra1-5/+5
2011-11-15Add built-in diff patterns for MATLAB codeLibravatar Gustaf Hendeby7-1/+39
2011-11-15git-compat-util: don't assume value for undefined variableLibravatar Ramkumar Ramachandra1-1/+1
2011-11-15sha1_file: don't mix enum with intLibravatar Ramkumar Ramachandra1-1/+1
2011-11-15convert: don't mix enum with intLibravatar Ramkumar Ramachandra1-3/+3
2011-11-15http: remove unused function hex()Libravatar Ramkumar Ramachandra1-8/+0
2011-11-15name-rev --all: do not even attempt to describe non-commit objectLibravatar Junio C Hamano1-1/+1
2011-11-15Revert "upload-archive: use start_command instead of fork"Libravatar Junio C Hamano4-31/+55
2011-11-13Convert many resolve_ref() calls to read_ref*() and ref_exists()Libravatar Nguyễn Thái Ngọc Duy12-32/+36
2011-11-12commit-tree: teach -m/-F options to read logs from elsewhereLibravatar Junio C Hamano2-6/+53
2011-11-12Git 1.7.8-rc2Libravatar Junio C Hamano2-2/+2
2011-11-11Merge branch 'ly/mktree-using-strbuf'Libravatar Junio C Hamano1-0/+1
2011-11-10Merge "Move 'builtin-*' into a 'builtin/' subdirectory"Libravatar Junio C Hamano943-17539/+77997
2011-11-10Merge 'build-in git-mktree'Libravatar Junio C Hamano1366-45469/+172869
2011-11-10mktree: fix a memory leak in write_tree()Libravatar Liu Yuan1-0/+1
2011-11-09commit-tree: update the command line parsingLibravatar Junio C Hamano1-13/+18
2011-11-09commit: teach --amend to carry forward extra headersLibravatar Junio C Hamano3-3/+76
2011-11-09merge: force edit and no-ff mode when merging a tag objectLibravatar Junio C Hamano1-0/+6