summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-07-19git submodule add: Require the new --force option to add ignored pathsLibravatar Jens Lehmann3-15/+35
2010-07-19Merge branch 'jl/add-n-ignore-missing'Libravatar Junio C Hamano5-6/+47
2010-07-19Documentation: Explain git-mergetool's use of temporary filesLibravatar David Aguilar1-0/+10
2010-07-19Documentation/reset: move "undo permanently" example behind "make topic"Libravatar Thomas Rast1-13/+13
2010-07-19Documentation/reset: reorder examples to match descriptionLibravatar Thomas Rast1-23/+23
2010-07-19Documentation/reset: promote 'examples' one section upLibravatar Thomas Rast1-107/+109
2010-07-19Documentation/reset: separate options by modeLibravatar Thomas Rast1-26/+33
2010-07-19Documentation/git-reset: reorder modes for soft-mixed-hard progressionLibravatar Thomas Rast1-6/+6
2010-07-19git-svn: write memoized data explicitly to avoid Storable bugLibravatar Sergey Vlasov1-0/+16
2010-07-16Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-13/+0
2010-07-16Only run aggregate-results over actual countsLibravatar Thomas Rast2-2/+2
2010-07-16Add a sample user for the svndump libraryLibravatar Jonathan Nieder4-0/+147
2010-07-16diff A...B: do not limit the syntax too narrowlyLibravatar Junio C Hamano1-13/+0
2010-07-15Export parse_date_basic() to convert a date string to timestampLibravatar Jonathan Nieder2-8/+7
2010-07-15Merge branch 'jn/paginate-fix'Libravatar Junio C Hamano2-46/+200
2010-07-15Merge branch 'wp/merge-tree-fix'Libravatar Junio C Hamano2-1/+259
2010-07-15Merge branch 'js/merge-rr-fix'Libravatar Junio C Hamano2-3/+3
2010-07-15Merge branch 'jc/diff-merge-base-multi'Libravatar Junio C Hamano1-8/+23
2010-07-15Merge branch 'ns/merge-recursive-uptodate'Libravatar Junio C Hamano1-1/+1
2010-07-15Merge branch 'jn/tests'Libravatar Junio C Hamano1-47/+42
2010-07-15Merge branch 'eb/doc-log-manpage'Libravatar Junio C Hamano1-6/+9
2010-07-15Merge branch 'jn/grep-open'Libravatar Junio C Hamano2-0/+16
2010-07-15Merge branch 'mg/revision-doc'Libravatar Junio C Hamano20-222/+257
2010-07-15Merge branch 'jk/maint-status-keep-index-timestamp'Libravatar Junio C Hamano1-5/+11
2010-07-15Merge branch 'jc/rebase-i-commit-msg-fix'Libravatar Junio C Hamano2-9/+28
2010-07-15Merge branch 'ab/submodule-add-f'Libravatar Junio C Hamano3-3/+29
2010-07-15Merge branch 'bc/maint-makefile-fixes'Libravatar Junio C Hamano1-5/+5
2010-07-15Merge branch 'maint'Libravatar Junio C Hamano3-2/+13
2010-07-15Documentation: add submodule.* to the big configuration variable listLibravatar Jonathan Nieder1-0/+9
2010-07-15gitmodules.5: url can be a relative pathLibravatar Jonathan Nieder1-0/+3
2010-07-15gitweb: fix esc_urlLibravatar Pavan Kumar Sunkara1-2/+1
2010-07-14git --paginate: paginate external commands againLibravatar Jonathan Nieder2-12/+38
2010-07-14MERGE_RR is in .git, not .git/rr-cacheLibravatar Jay Soffian2-3/+3
2010-07-14merge-tree: fix where two branches share no changesLibravatar Will Palmer2-4/+5
2010-07-14add basic tests for merge-treeLibravatar Will Palmer1-0/+257
2010-07-14Git 1.7.2-rc3Libravatar Junio C Hamano1-1/+4
2010-07-14Merge branch 'jc/read-tree-cache-tree-fix'Libravatar Junio C Hamano2-5/+16
2010-07-14Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()Libravatar Raja R Harinath1-1/+2
2010-07-13diff A...B: give one possible diff when there are more than one merge-baseLibravatar Junio C Hamano1-8/+23
2010-07-13Merge branch 'maint'Libravatar Junio C Hamano2-2/+5
2010-07-13git fetch documentation: describe short '-p' synonym to '--prune' optionLibravatar Oren Held1-0/+1
2010-07-13format-patch: document the format.to configuration settingLibravatar Miklos Vajna1-2/+4
2010-07-12git add: Add the "--ignore-missing" option for the dry runLibravatar Jens Lehmann5-6/+47
2010-07-12test-lib: TAP compliance for skipping tests on requestLibravatar Michael J Gruber1-2/+2
2010-07-12test-lib: simplify GIT_SKIP_TESTS loopLibravatar Michael J Gruber1-10/+3
2010-07-11Merge branch 'maint'Libravatar Junio C Hamano3-2/+3
2010-07-11t3000 (ls-files -o): modernize styleLibravatar Jonathan Nieder1-47/+42
2010-07-10git-gui: fix usage of themed widgets variableLibravatar Heiko Voigt1-0/+1
2010-07-10git-gui: Handle failure of core.worktree to identify the working directory.Libravatar Pat Thoyts1-0/+3
2010-07-09Documentation: Spelling fix in protocol-capabilities.txtLibravatar Fredrik Skolmli1-1/+1