summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano2009-11-272-10/+11
* gitworkflows: Consistently back-quote git commandsBjörn Gustavsson2009-11-261-1/+1
* Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-259-25/+32
|\
| * Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-238-18/+26
| * mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-231-7/+6
* | Explicitly truncate bswap operand to uint32_tBenjamin Kramer2009-11-251-1/+1
* | t1200: fix a timing dependent errorNanako Shiraishi2009-11-252-5/+9
* | Merge branch 'rj/maint-cygwin-count-objects'Junio C Hamano2009-11-241-0/+1
|\ \
| * | git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones2009-11-191-0/+1
| |/
* | Documentation: update descriptions of revision options related to '--bisect'Christian Couder2009-11-241-12/+27
* | Enable support for IPv6 on MinGWMartin Storsjö2009-11-243-2/+181
* | Refactor winsock initialization into a separate functionMartin Storsjö2009-11-241-3/+12
* | Merge branch 'rs/color-escape-has-zero-width'Junio C Hamano2009-11-232-4/+22
|\ \
| * | strbuf_add_wrapped_text(): skip over colour codesRené Scharfe2009-11-232-4/+22
* | | Merge branch 'bg/apply-doc'Junio C Hamano2009-11-232-21/+39
|\ \ \
| * | | Fix over-simplified documentation for 'git log -z'Björn Gustavsson2009-11-231-5/+7
| * | | apply: Use the term "working tree" consistentlyBjörn Gustavsson2009-11-221-2/+2
| * | | apply: Format all options using back-quotesBjörn Gustavsson2009-11-221-8/+8
| * | | apply: apply works outside a repositoryBjörn Gustavsson2009-11-221-3/+6
| * | | Clarify and correct -zBjörn Gustavsson2009-11-222-8/+21
* | | | Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano2009-11-235-3/+32
|\ \ \ \
| * | | | user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy2009-11-221-2/+18
| * | | | merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-224-1/+14
| | |_|/ | |/| |
* | | | Merge branch 'jc/log-stdin'Junio C Hamano2009-11-238-34/+164
|\ \ \ \
| * | | | Add trivial tests for --stdin option to log familyJunio C Hamano2009-11-231-0/+61
| * | | | Make --stdin option to "log" family read also pathspecsJunio C Hamano2009-11-202-5/+71
| * | | | setup_revisions(): do not call get_pathspec() too earlyJunio C Hamano2009-11-201-3/+6
| * | | | Teach --stdin option to "log" familyJunio C Hamano2009-11-207-22/+20
| * | | | read_revision_from_stdin(): use strbufJunio C Hamano2009-11-201-8/+10
* | | | | Merge branch 'mr/gitweb-snapshot'Junio C Hamano2009-11-234-19/+234
|\ \ \ \ \
| * | | | | t/gitweb-lib: Split HTTP response with non-GNU sedBrian Gernhardt2009-11-231-2/+12
| * | | | | gitweb: Smarter snapshot namesMark Rada2009-11-082-21/+93
| * | | | | gitweb: Document current snapshot rules via new testsJakub Narebski2009-11-081-0/+87
| * | | | | t/gitweb-lib.sh: Split gitweb output into headers and bodyJakub Narebski2009-10-301-1/+5
| * | | | | gitweb: check given hash before trying to create snapshotMark Rada2009-09-292-2/+44
* | | | | | Merge branch 'cc/replace'Junio C Hamano2009-11-236-10/+38
|\ \ \ \ \ \
| * | | | | | Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTSChristian Couder2009-11-201-0/+3
| * | | | | | Documentation: fix typos and spelling in replace documentationChristian Couder2009-11-201-10/+11
| * | | | | | replace: use a GIT_NO_REPLACE_OBJECTS env variableChristian Couder2009-11-205-0/+24
* | | | | | | Merge branch 'maint'Junio C Hamano2009-11-236-6/+26
|\ \ \ \ \ \ \
| * | | | | | | pack-objects: split implications of --all-progress from progress activationNicolas Pitre2009-11-234-5/+20
| * | | | | | | instaweb: restart server if already runningStephen Boyd2009-11-231-0/+5
| * | | | | | | prune-packed: only show progress when stderr is a ttyJeff King2009-11-231-1/+1
* | | | | | | | remote-curl.c: fix rpc_out()Tay Ray Chuan2009-11-231-1/+1
* | | | | | | | t4014-format-patch: do not assume 'test' is available as non-builtinJohannes Sixt2009-11-231-4/+2
* | | | | | | | Merge branch 'bg/fetch-multi'Junio C Hamano2009-11-2313-115/+492
|\ \ \ \ \ \ \ \
| * | | | | | | | Re-implement 'git remote update' using 'git fetch'Björn Gustavsson2009-11-101-60/+28
| * | | | | | | | builtin-fetch: add --dry-run optionJay Soffian2009-11-102-4/+15
| * | | | | | | | builtin-fetch: add --prune optionJay Soffian2009-11-102-2/+34
| * | | | | | | | teach warn_dangling_symref to take a FILE argumentJay Soffian2009-11-103-5/+6
View Lorry Controller Status