summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add allocation and freeing functions for struct refsDaniel Barkalow2007-07-093-4/+30
* Makefile: rebuild git.o on version change, clean up git$X flagsMatt McCutchen2007-07-091-3/+2
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-092-15/+46
* Support wholesale directory renames in fast-importShawn O. Pearce2007-07-093-19/+168
* Merge branch 'maint'Shawn O. Pearce2007-07-091-3/+5
|\
| * Clarify documentation of fast-import's D subcommandShawn O. Pearce2007-07-091-3/+5
* | Revert 88494423 (removal of duplicate parents in the output codepath)Junio C Hamano2007-07-081-13/+1
* | revision.c: remove duplicated parents after history simplificationJunio C Hamano2007-07-081-0/+20
* | Document custom hunk header selectionJunio C Hamano2007-07-081-4/+51
* | Merge branch 'maint'Junio C Hamano2007-07-082-6/+23
|\ \ | |/
| * user-manual: fix directory name in git-archive exampleWilliam Pursell2007-07-081-1/+1
| * user-manual: more explanation of push and pull usageJ. Bruce Fields2007-07-081-1/+18
| * tutorial: Fix typoJ. Bruce Fields2007-07-081-1/+1
| * user-manual: grammar and style fixesAndy Parkins2007-07-081-3/+3
* | rebase -i: put a nice warning into the todo listJohannes Schindelin2007-07-081-0/+3
* | rebase -i: remember the settings of -v, -s and -p when interruptedJohannes Schindelin2007-07-082-0/+14
* | rebase -i: actually show the diffstat when being verboseJohannes Schindelin2007-07-081-4/+4
* | rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin2007-07-082-10/+32
* | t7004: Skip tests for signed tags in an old version of gpg.Carlos Rica2007-07-081-0/+11
* | Fix merge-one-file for our-side-added/our-side-removed casesJunio C Hamano2007-07-081-4/+6
* | git-commit: don't add multiple Signed-off-by: from the same identityGerrit Pape2007-07-081-9/+11
* | branch.autosetupmerge: allow boolean values, or "all"Johannes Schindelin2007-07-084-9/+28
* | git-stash: try reusing cached stat info as much as possibleJunio C Hamano2007-07-081-3/+3
* | diff.c: make built-in hunk header pattern a separate tableJunio C Hamano2007-07-081-6/+16
* | gitweb: make "No commits" in project list gray, not bold greenMatt McCutchen2007-07-072-0/+7
* | gitweb: make search form generate pathinfo-style URLsMatt McCutchen2007-07-071-3/+9
* | gitweb: prefer git_get_project_owner() over get_file_owner()Miklos Vajna2007-07-071-2/+2
* | gitweb: make repeated calls to git_get_project_owner() bearableJunio C Hamano2007-07-071-8/+20
* | Merge branch 'js/stash'Junio C Hamano2007-07-072-1/+89
|\ \
| * | Teach git-stash to "apply --index"Johannes Schindelin2007-07-062-1/+89
* | | Merge branch 'jc/diff-mark'Junio C Hamano2007-07-0714-63/+336
|\ \ \
| * | | diff: honor binariness specified in attributesJunio C Hamano2007-07-072-5/+21
| * | | Fix configuration syntax to specify customized hunk header patterns.Junio C Hamano2007-07-073-71/+84
| * | | Per-path attribute based hunk header selection.Junio C Hamano2007-07-067-15/+256
| * | | Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-066-10/+10
| * | | Introduce diff_filespec_is_binary()Junio C Hamano2007-07-063-36/+39
| |/ /
* | | Merge branch 'maint'Junio C Hamano2007-07-072-1/+11
|\ \ \ | | |/ | |/|
| * | Fix "apply --reverse" with regard to whitespaceJohannes Schindelin2007-07-072-1/+11
* | | diff-lib.c: don't strdup twiceRené Scharfe2007-07-071-1/+1
* | | git-branch: default to --trackJohannes Schindelin2007-07-061-1/+1
* | | git-send-email: allow an email alias for --fromMichael Hendricks2007-07-061-0/+2
* | | cvsserver: always initialize state in argsplit()Frank Lichtenheld2007-07-061-4/+4
* | | stash: allow running from a subdirectoryJames Bowes2007-07-061-0/+1
* | | git-submodule(1): update description and key namesLars Hjemli2007-07-061-3/+3
* | | Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-069-40/+64
* | | Add [verse] to the SYNOPSIS section of git-submodule.txt.Matt Kraai2007-07-061-0/+1
* | | Change "added.moved or removed" to "added, moved or removed" inMatt Kraai2007-07-061-1/+1
* | | Fixed a formulation mistake in Documentation/user-manual.txtMarcus Fritzsch2007-07-061-7/+7
| |/ |/|
* | Prefer EMAIL to username@hostname.Matt Kraai2007-07-051-7/+12
* | make git-clone GIT_WORK_TREE awareMatthias Lederhofer2007-07-051-7/+18