aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-05
|\
| * push: allow already-exists advice to be disabledChris Rorvick2012-12-03
| * push: rename config variable for more general useChris Rorvick2012-12-03
| * push: cleanup push rules commentChris Rorvick2012-12-03
| * push: clarify rejection of update to non-commit-ishChris Rorvick2012-12-02
| * push: require force for annotated tagsChris Rorvick2012-12-02
| * push: require force for refs under refs/tags/Chris Rorvick2012-12-02
| * push: flag updates that require forceChris Rorvick2012-12-02
| * push: keep track of "update" state separatelyChris Rorvick2012-12-02
| * push: add advice for rejected tag referenceChris Rorvick2012-12-02
| * push: return reject reasons as a bitsetChris Rorvick2012-12-02
* | Merge branch 'fc/fast-export-fixes'Junio C Hamano2013-01-05
|\ \
| * | fast-export: make sure updated refs get updatedFelipe Contreras2012-12-03
| * | fast-export: don't handle uninteresting refsFelipe Contreras2012-12-03
| * | fast-export: fix comparison in testsFelipe Contreras2012-11-29
| * | fast-export: trivial cleanupFelipe Contreras2012-11-29
| * | remote-testgit: implement the "done" feature manuallyFelipe Contreras2012-11-29
| * | remote-testgit: report success after an importFelipe Contreras2012-11-29
| * | remote-testgit: exercise more featuresFelipe Contreras2012-11-29
| * | remote-testgit: cleanup testsFelipe Contreras2012-11-29
| * | remote-testgit: remove irrelevant testFelipe Contreras2012-11-29
| * | remote-testgit: remove non-local functionalityFelipe Contreras2012-11-29
| * | Add new simplified git-remote-testgitFelipe Contreras2012-11-29
| * | Rename git-remote-testgit to git-remote-testpyFelipe Contreras2012-11-29
| * | remote-helpers: fix failure messageFelipe Contreras2012-11-26
| * | remote-testgit: fix direction of marksFelipe Contreras2012-11-26
| * | fast-export: avoid importing blob marksFelipe Contreras2012-11-26
* | | Merge branch 'mh/unify-xml-in-imap-send-and-http-push'Junio C Hamano2013-01-05
|\ \ \
| * | | wrap_in_html(): process message in bulk rather than line-by-lineMichael Haggerty2012-12-02
| * | | wrap_in_html(): use strbuf_addstr_xml_quoted()Michael Haggerty2012-11-29
| * | | imap-send: change msg_data from storing (ptr, len) to storing strbufMichael Haggerty2012-11-29
| * | | imap-send: correctly report errors reading from stdinMichael Haggerty2012-11-26
| * | | imap-send: store all_msgs as a strbufMichael Haggerty2012-11-26
| * | | lf_to_crlf(): NUL-terminate msg_data::dataMichael Haggerty2012-11-26
| * | | xml_entities(): use function strbuf_addstr_xml_quoted()Michael Haggerty2012-11-26
| * | | Add new function strbuf_add_xml_quoted()Michael Haggerty2012-11-26
* | | | Merge branch 'nd/pathspec-wildcard'Junio C Hamano2013-01-05
|\ \ \ \
| * | | | tree_entry_interesting: do basedir compare on wildcard patterns when possibleNguyễn Thái Ngọc Duy2012-11-26
| * | | | pathspec: apply "*.c" optimization from excludeNguyễn Thái Ngọc Duy2012-11-26
| * | | | pathspec: do exact comparison on the leading non-wildcard partNguyễn Thái Ngọc Duy2012-11-26
| * | | | pathspec: save the non-wildcard length partNguyễn Thái Ngọc Duy2012-11-19
* | | | | Merge branch 'jk/fsck-dot-in-trees'Junio C Hamano2013-01-05
|\ \ \ \ \
| * | | | | fsck: warn about ".git" in treesJeff King2012-11-28
| * | | | | fsck: warn about '.' and '..' in treesJeff King2012-11-28
* | | | | | Merge branch 'pf/editor-ignore-sigint'Junio C Hamano2013-01-05
|\ \ \ \ \ \
| * | | | | | fix compilation with NO_PTHREADSJeff King2013-01-05
* | | | | | | Update draft release notes to 1.8.2Junio C Hamano2013-01-03
* | | | | | | Merge branch 'da/p4merge-mktemp'Junio C Hamano2013-01-03
|\ \ \ \ \ \ \
| * | | | | | | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar2012-12-26
* | | | | | | | Merge branch 'ms/subtree-fixlets'Junio C Hamano2013-01-03
|\ \ \ \ \ \ \ \