summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2007-07-09rerere: record resolution even if file is not in merge baseLibravatar Johannes Schindelin2-15/+46
2007-07-09Support wholesale directory renames in fast-importLibravatar Shawn O. Pearce3-19/+168
2007-07-09Merge branch 'maint'Libravatar Shawn O. Pearce1-3/+5
2007-07-09Clarify documentation of fast-import's D subcommandLibravatar Shawn O. Pearce1-3/+5
2007-07-08Revert 88494423 (removal of duplicate parents in the output codepath)Libravatar Junio C Hamano1-13/+1
2007-07-08revision.c: remove duplicated parents after history simplificationLibravatar Junio C Hamano1-0/+20
2007-07-08Document custom hunk header selectionLibravatar Junio C Hamano1-4/+51
2007-07-08Merge branch 'maint'Libravatar Junio C Hamano2-6/+23
2007-07-08rebase -i: put a nice warning into the todo listLibravatar Johannes Schindelin1-0/+3
2007-07-08rebase -i: remember the settings of -v, -s and -p when interruptedLibravatar Johannes Schindelin2-0/+14
2007-07-08rebase -i: actually show the diffstat when being verboseLibravatar Johannes Schindelin1-4/+4
2007-07-08rebase -i: handle --continue more like non-interactive rebaseLibravatar Johannes Schindelin2-10/+32
2007-07-08t7004: Skip tests for signed tags in an old version of gpg.Libravatar Carlos Rica1-0/+11
2007-07-08Fix merge-one-file for our-side-added/our-side-removed casesLibravatar Junio C Hamano1-4/+6
2007-07-08git-commit: don't add multiple Signed-off-by: from the same identityLibravatar Gerrit Pape1-9/+11
2007-07-08branch.autosetupmerge: allow boolean values, or "all"Libravatar Johannes Schindelin4-9/+28
2007-07-08git-stash: try reusing cached stat info as much as possibleLibravatar Junio C Hamano1-3/+3
2007-07-08user-manual: fix directory name in git-archive exampleLibravatar William Pursell1-1/+1
2007-07-08user-manual: more explanation of push and pull usageLibravatar J. Bruce Fields1-1/+18
2007-07-08tutorial: Fix typoLibravatar J. Bruce Fields1-1/+1
2007-07-08user-manual: grammar and style fixesLibravatar Andy Parkins1-3/+3
2007-07-08diff.c: make built-in hunk header pattern a separate tableLibravatar Junio C Hamano1-6/+16
2007-07-07gitweb: make "No commits" in project list gray, not bold greenLibravatar Matt McCutchen2-0/+7
2007-07-07gitweb: make search form generate pathinfo-style URLsLibravatar Matt McCutchen1-3/+9
2007-07-07gitweb: prefer git_get_project_owner() over get_file_owner()Libravatar Miklos Vajna1-2/+2
2007-07-07gitweb: make repeated calls to git_get_project_owner() bearableLibravatar Junio C Hamano1-8/+20
2007-07-07Merge branch 'js/stash'Libravatar Junio C Hamano2-1/+89
2007-07-07Merge branch 'jc/diff-mark'Libravatar Junio C Hamano14-63/+336
2007-07-07Merge branch 'maint'Libravatar Junio C Hamano2-1/+11
2007-07-07diff: honor binariness specified in attributesLibravatar Junio C Hamano2-5/+21
2007-07-07Fix "apply --reverse" with regard to whitespaceLibravatar Johannes Schindelin2-1/+11
2007-07-07diff-lib.c: don't strdup twiceLibravatar René Scharfe1-1/+1
2007-07-07Fix configuration syntax to specify customized hunk header patterns.Libravatar Junio C Hamano3-71/+84
2007-07-06git-branch: default to --trackLibravatar Johannes Schindelin1-1/+1
2007-07-06git-send-email: allow an email alias for --fromLibravatar Michael Hendricks1-0/+2
2007-07-06cvsserver: always initialize state in argsplit()Libravatar Frank Lichtenheld1-4/+4
2007-07-06stash: allow running from a subdirectoryLibravatar James Bowes1-0/+1
2007-07-06git-submodule(1): update description and key namesLibravatar Lars Hjemli1-3/+3
2007-07-06Enable "git rerere" by the config variable rerere.enabledLibravatar Johannes Schindelin9-40/+64
2007-07-06Add [verse] to the SYNOPSIS section of git-submodule.txt.Libravatar Matt Kraai1-0/+1
2007-07-06Change "added.moved or removed" to "added, moved or removed" inLibravatar Matt Kraai1-1/+1
2007-07-06Fixed a formulation mistake in Documentation/user-manual.txtLibravatar Marcus Fritzsch1-7/+7
2007-07-06Teach git-stash to "apply --index"Libravatar Johannes Schindelin2-1/+89
2007-07-06Per-path attribute based hunk header selection.Libravatar Junio C Hamano7-15/+256
2007-07-06Future-proof source for changes in xdemitconf_tLibravatar Johannes Schindelin6-10/+10
2007-07-06Introduce diff_filespec_is_binary()Libravatar Junio C Hamano3-36/+39
2007-07-05Prefer EMAIL to username@hostname.Libravatar Matt Kraai1-7/+12
2007-07-05make git-clone GIT_WORK_TREE awareLibravatar Matthias Lederhofer1-7/+18
2007-07-05git-clone: split up long &&-command-chain and use a function for cleanupLibravatar Matthias Lederhofer1-4/+13
2007-07-05fix remote.origin.url in tutorial.txtLibravatar Alecs King1-1/+1