aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | Fix archive format with -- on the command lineJunio C Hamano2009-12-10
* | | | | | | | | Remove post-upload-hookJunio C Hamano2009-12-10
* | | | | | | | | Merge branch 'mm/maint-merge-ff-error-message-fix' into maintJunio C Hamano2009-12-08
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy2009-11-29
| * | | | | | | | | merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-29
* | | | | | | | | | Merge branch 'jn/maint-pull-rebase-error-message' into maintJunio C Hamano2009-12-08
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-03
* | | | | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2009-12-08
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | add-interactive: fix deletion of non-empty filesJeff King2009-12-07
* | | | | | | | | | | Git 1.6.5.5v1.6.5.5Junio C Hamano2009-12-05
* | | | | | | | | | | Fix diff -B/--dirstat miscounting of newly added contentsLinus Torvalds2009-12-05
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | reset: improve worktree safety valvesJeff King2009-12-05
* | | | | | | | | | Documentation: Avoid use of xmlto --stringparamTodd Zullinger2009-12-05
* | | | | | | | | | archive: clarify description of path parameterRené Scharfe2009-12-04
* | | | | | | | | | rerere: don't segfault on failure to open rr-cacheJeff King2009-12-04
* | | | | | | | | | Prepare for 1.6.5.5Junio C Hamano2009-12-03
* | | | | | | | | | Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-12-03
| * | | | | | | | | | shortlog: respect commit encodingUwe Kleine-König2009-11-25
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: add test for parsing of "--"Felipe Contreras2009-11-26
| * | | | | | | | | | format-patch: fix parsing of "--" on the command lineFelipe Contreras2009-11-26
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ap/maint-merge-strategy-list-fix' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun2009-11-29
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/maint-am-keep' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove dead code from "git am"Junio C Hamano2009-11-27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-23
| * | | | | | | | | | mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-23
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rj/maint-cygwin-count-objects' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones2009-11-19
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy2009-11-22
| * | | | | | | | | | merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-22
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'th/maint-remote-update-help-string' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update 'git remote update' usage string to match man page.Tim Henigan2009-11-15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rj/maint-t9700' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones2009-11-19
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ls/maint-mailinfo-no-inbody' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström2009-11-20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie2009-11-16
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'th/remote-usage' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git remote: Separate usage strings for subcommandsTim Henigan2009-11-20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)2009-11-17
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: avoid xmlto input errorJunio C Hamano2009-11-21
| * | | | | | | | | | expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2009-11-19
| * | | | | | | | | | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-17
| |/ / / / / / / / /