summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-03-14Documentation: add git-mergetool to the command list.Libravatar Junio C Hamano1-0/+1
2007-03-14Merge branch 'master' of git://repo.or.cz/git/mergetoolLibravatar Junio C Hamano5-1/+405
2007-03-13git-svn: add -l/--local command to "git svn rebase"Libravatar Eric Wong2-2/+13
2007-03-13Add git-mergetool to run an appropriate merge conflict resolution programLibravatar Theodore Ts'o5-1/+405
2007-03-12Merge branch 'master' of git://repo.or.cz/git-guiLibravatar Junio C Hamano1-0/+5
2007-03-12Merge branch 'maint'Libravatar Junio C Hamano5-158/+16
2007-03-12Merge branch 'master' of git://repo.or.cz/git/fastimportLibravatar Junio C Hamano2-4/+54
2007-03-12Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintLibravatar Junio C Hamano1-2/+2
2007-03-12Fix t5510-fetch's use of sedLibravatar Shawn O. Pearce1-1/+7
2007-03-12Simplify closing two fds at once in run-command.cLibravatar Shawn O. Pearce1-6/+9
2007-03-12Remove unnecessary casts from fast-importLibravatar Shawn O. Pearce1-2/+2
2007-03-12Merge branch 'maint'Libravatar Shawn O. Pearce1-2/+2
2007-03-12New fast-import test case for valid tree sortingLibravatar Jeff King1-0/+50
2007-03-12fast-import: grow tree storage more aggressivelyLibravatar Jeff King1-2/+2
2007-03-12Don't package the git-gui credits file anymoreLibravatar Shawn O. Pearce1-2/+1
2007-03-12Merge branch 'maint' of git://repo.or.cz/git-gui into maintLibravatar Junio C Hamano4-156/+15
2007-03-12Re-fix get_sha1_oneline()Libravatar Linus Torvalds1-5/+5
2007-03-12Merge branch 'maint'Libravatar Shawn O. Pearce4-156/+15
2007-03-12git-gui: Allow 'git gui version' outside of a repositoryLibravatar Shawn O. Pearce1-7/+5
2007-03-12git-gui: Revert "git-gui: Display all authors of git-gui."Libravatar Shawn O. Pearce4-135/+9
2007-03-12git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."Libravatar Shawn O. Pearce1-19/+6
2007-03-12git-gui: Allow committing empty mergesLibravatar Shawn O. Pearce1-1/+1
2007-03-11git-bundle: only die if pack would be empty, warn if ref is skippedLibravatar Johannes Schindelin1-3/+8
2007-03-11git-send-email: configurable bcc and chain-reply-toLibravatar Avi Kivity2-1/+19
2007-03-11Merge branch 'maint'Libravatar Junio C Hamano2-1/+19
2007-03-11git-send-email: Document configuration optionsLibravatar Avi Kivity1-0/+13
2007-03-11git-merge: warn when -m provided on a fast forwardLibravatar J. Bruce Fields1-1/+6
2007-03-11Merge branch 'jc/boundary'Libravatar Junio C Hamano4-197/+243
2007-03-11Change {pre,post}-receive hooks to use stdinLibravatar Shawn O. Pearce3-58/+62
2007-03-11Split back out update_hook handling in receive-packLibravatar Shawn O. Pearce1-2/+24
2007-03-11Refactor run_command error handling in receive-packLibravatar Shawn O. Pearce1-19/+24
2007-03-11Teach run_command how to setup a stdin pipeLibravatar Shawn O. Pearce2-1/+37
2007-03-11Split run_command into two halves (start/finish)Libravatar Shawn O. Pearce2-7/+22
2007-03-11Start defining a more sophisticated run_commandLibravatar Shawn O. Pearce2-7/+27
2007-03-11Remove unused run_command variantsLibravatar Shawn O. Pearce3-50/+1
2007-03-11Switch to run_command_v_opt in revertLibravatar Shawn O. Pearce1-4/+9
2007-03-11cvsserver: Use Merged response instead of Update-existing for merged filesLibravatar Frank Lichtenheld1-3/+3
2007-03-11I like the idea of the new ':/<oneline prefix>' notation, and gave itLibravatar Jim Meyering1-2/+6
2007-03-10Merge branch 'js/attach'Libravatar Junio C Hamano11-47/+384
2007-03-10Merge branch 'js/diff-ni'Libravatar Junio C Hamano32-131/+176
2007-03-10Merge branch 'jc/fsck'Libravatar Junio C Hamano3-15/+41
2007-03-10Merge branch 'pb/commit-i'Libravatar Junio C Hamano2-7/+23
2007-03-10Merge branch 'js/revert-cherry'Libravatar Junio C Hamano5-203/+407
2007-03-10Merge branch 'sp/make'Libravatar Junio C Hamano3-44/+76
2007-03-10Merge branch 'maint'Libravatar Junio C Hamano7-48/+100
2007-03-10git.el: Retrieve commit log information from .dotest directory.Libravatar Alexandre Julliard1-24/+53
2007-03-10git.el: Avoid appending a signoff line that is already present.Libravatar Alexandre Julliard1-6/+18
2007-03-10setup_git_directory_gently: fix off-by-one errorLibravatar Matthias Lederhofer1-1/+1
2007-03-10Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maintLibravatar Junio C Hamano3-20/+29
2007-03-10user-manual: install user manual stylesheet with other web documentsLibravatar J. Bruce Fields1-1/+1