summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* log: teach "terminator" vs "separator" mode to "--pretty=format"Junio C Hamano2008-04-107-31/+43
* Merge branch 'maint'Junio C Hamano2008-04-108-30/+45
|\
| * git-fetch: fix status output when not storing tracking refJeff King2008-04-101-15/+13
| * Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-107-15/+32
| |\
| | * core-tutorial.txt: Fix showing the current behaviour.Carlos Rica2008-04-101-6/+6
| | * git-archive: ignore prefix when checking file attributeRené Scharfe2008-04-103-5/+22
| | * Fix documentation syntax of optional arguments in short options.Carlos Rica2008-04-103-4/+4
* | | Merge branch 'jc/rename'Junio C Hamano2008-04-091-22/+58
|\ \ \
| * | | Optimize rename detection for a huge diffJunio C Hamano2008-02-131-22/+58
* | | | Merge branch 'gp/gitweb'Junio C Hamano2008-04-094-3/+21
|\ \ \ \
| * | | | gitweb: fallback to system-wide config file (fixup)Gerrit Pape2008-04-051-0/+1
| * | | | gitweb: fallback to system-wide config file if default config does not existGerrit Pape2008-03-274-3/+20
* | | | | Merge branch 'mk/unpack-careful'Junio C Hamano2008-04-095-33/+284
|\ \ \ \ \
| * | | | | t5300: add test for "index-pack --strict"Martin Koegler2008-03-071-0/+47
| * | | | | receive-pack: allow using --strict mode for unpacking objectsMartin Koegler2008-03-052-13/+29
| * | | | | unpack-objects: fix --strict handlingJunio C Hamano2008-03-052-17/+58
| * | | | | t5300: add test for "unpack-objects --strict"Junio C Hamano2008-03-051-0/+48
| * | | | | unpack-objects: prevent writing of inconsistent objectsMartin Koegler2008-03-052-7/+106
* | | | | | Merge branch 'fl/send-email-outside'Junio C Hamano2008-04-093-36/+32
|\ \ \ \ \ \
| * | | | | | send-email: Don't require to be called in a repositoryFrank Lichtenheld2008-03-151-9/+11
| * | | | | | Git.pm: Don't require repository instance for identFrank Lichtenheld2008-03-151-6/+6
| * | | | | | Git.pm: Don't require a repository instance for configFrank Lichtenheld2008-03-151-20/+13
| * | | | | | var: Don't require to be in a git repository.Frank Lichtenheld2008-03-151-1/+2
* | | | | | | Merge branch 'jc/rebase'Junio C Hamano2008-04-091-20/+32
|\ \ \ \ \ \ \
| * | | | | | | rebase [--onto O] A B: omit needless checkoutJunio C Hamano2008-03-161-20/+32
* | | | | | | | Merge branch 'jk/add-i-mode'Junio C Hamano2008-04-092-0/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | add--interactive: allow user to choose mode updateJeff King2008-03-272-1/+44
| * | | | | | | | add--interactive: ignore mode change in 'p'atch commandJeff King2008-03-272-0/+25
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'gs/pretty-hexval'Junio C Hamano2008-04-093-2/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | pretty.c: add %x00 format specifier.Govind Salinas2008-03-233-2/+16
* | | | | | | | GIT 1.5.5v1.5.5Junio C Hamano2008-04-073-8/+7
* | | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-04-071-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | gitk: Fix changing colors through Edit->PreferencesGerrit Pape2008-04-061-3/+3
* | | | | | | | | git-svn: fix following renamed paths when tracking a single pathEric Wong2008-04-073-2/+113
* | | | | | | | | Merge branch 'jc/maint-apply-match-beginning'Junio C Hamano2008-04-062-13/+29
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix "git apply" to correctly enforce "match at the beginning"Junio C Hamano2008-04-062-13/+29
* | | | | | | | | Add prefix oriented completions for diff and format-patch commands.Pascal Obry2008-04-061-1/+4
* | | | | | | | | test suite: remove useless TERM cruft in "t7005-editor.sh"Christian Couder2008-04-061-4/+0
* | | | | | | | | Add interactive option in rebase command completion list.Pascal Obry2008-04-061-1/+1
* | | | | | | | | Add description of OFS_DELTA to the pack format descriptionPeter Eriksen2008-04-061-1/+15
* | | | | | | | | git-pack-objects.txt: Make wording slightly less ambiguousPeter Eriksen2008-04-051-2/+3
* | | | | | | | | git-fetch: Don't trigger a bus error when given the refspec "tag"Kevin Ballard2008-04-051-0/+2
* | | | | | | | | Revert "gitweb: Add 'status_str' to parse_difftree_raw_line output"Jakub Narebski2008-04-051-3/+2
* | | | | | | | | Merge git://repo.or.cz/git-guiJunio C Hamano2008-04-042-51/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-gui: use +/- instead of ]/[ to show more/less context in diffgitgui-0.10.1Michele Ballabio2008-04-051-6/+12
| * | | | | | | | | git-gui: Update french translationChristian Couder2008-04-041-45/+33
| * | | | | | | | | git-gui: Switch keybindings for [ and ] to bracketleft and bracketrightShawn O. Pearce2008-04-031-4/+4
* | | | | | | | | | GIT 1.5.5-rc3v1.5.5-rc3Junio C Hamano2008-04-022-5/+5
* | | | | | | | | | Merge branch 'js/filter-branch'Junio C Hamano2008-04-022-3/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | filter-branch: Fix renaming a directory in the tree-filterveillette@yahoo.ca2008-03-312-2/+2