summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2011-11-28fast-import: Fix incorrect fanout level when modifying existing notes refsLibravatar Johan Herland2-7/+29
2011-11-28t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handlingLibravatar Johan Herland1-0/+54
2011-11-28t9301: Fix testcase covering up a bug in fast-import's notes fanout handlingLibravatar Johan Herland1-7/+6
2011-11-28Git 1.7.8-rc4Libravatar Junio C Hamano2-2/+2
2011-11-28Allow checkout -B <current-branch> to update the current branchLibravatar Jonathan Nieder5-12/+23
2011-11-28branch: allow a no-op "branch -M <current-branch> HEAD"Libravatar Jonathan Nieder2-1/+24
2011-11-28convert: track state in LF-to-CRLF filterLibravatar Carlos Martín Nieto1-13/+37
2011-11-28checkout,merge: loosen overwriting untracked file check based on info/excludeLibravatar Nguyễn Thái Ngọc Duy2-2/+2
2011-11-23Merge branch 'maint' into tj/imap-send-remove-unusedLibravatar Junio C Hamano2374-58531/+446169
2011-11-23imap-send: Remove unused 'use_namespace' variableLibravatar Thomas Jarosch1-1/+0
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 '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-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