summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* push: allow already-exists advice to be disabledChris Rorvick2012-12-034-2/+11
* push: rename config variable for more general useChris Rorvick2012-12-034-7/+10
* push: cleanup push rules commentChris Rorvick2012-12-031-15/+17
* push: clarify rejection of update to non-commit-ishChris Rorvick2012-12-021-0/+5
* push: require force for annotated tagsChris Rorvick2012-12-023-7/+35
* push: require force for refs under refs/tags/Chris Rorvick2012-12-029-13/+62
* push: flag updates that require forceChris Rorvick2012-12-023-5/+12
* push: keep track of "update" state separatelyChris Rorvick2012-12-022-7/+12
* push: add advice for rejected tag referenceChris Rorvick2012-12-025-0/+25
* push: return reject reasons as a bitsetChris Rorvick2012-12-024-24/+19
* Merge branch 'ph/maint-submodule-status-fix'Jeff King2012-11-092-5/+3
|\
| * submodule status: remove unused orig_* variablesJens Lehmann2012-10-291-3/+1
| * t7407: Fix recursive submodule testPhil Hord2012-10-291-2/+2
* | Merge branch 'nd/builtin-to-libgit'Jeff King2012-11-0922-1497/+1535
|\ \
| * | fetch-pack: move core code to libgit.aNguyễn Thái Ngọc Duy2012-10-293-948/+952
| * | fetch-pack: remove global (static) configuration variable "args"Nguyễn Thái Ngọc Duy2012-10-291-77/+83
| * | send-pack: move core code to libgit.aNguyễn Thái Ngọc Duy2012-10-294-333/+350
| * | Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-297-53/+52
| * | Move print_commit_list to libgit.aNguyễn Thái Ngọc Duy2012-10-294-14/+14
| * | Move estimate_bisect_steps to libgit.aNguyễn Thái Ngọc Duy2012-10-292-39/+38
| * | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-296-112/+125
* | | Merge branch 'nd/tree-walk-enum-cleanup'Jeff King2012-11-091-4/+4
|\ \ \
| * | | tree-walk: use enum interesting instead of integerNguyễn Thái Ngọc Duy2012-10-191-4/+4
* | | | Merge branch 'sz/maint-curl-multi-timeout'Jeff King2012-11-091-0/+12
|\ \ \ \
| * | | | Fix potential hang in https handshakeStefan Zager2012-10-191-0/+12
| | |_|/ | |/| |
* | | | Merge branch 'fc/completion-send-email-with-format-patch'Jeff King2012-11-092-17/+23
|\ \ \ \
| * | | | completion: add format-patch options to send-emailFelipe Contreras2012-10-162-17/+23
* | | | | Merge branch 'mo/cvs-server-cleanup'Jeff King2012-11-093-215/+440
|\ \ \ \ \
| * | | | | Use character class for sed expression instead of \sBen Walton2012-10-261-1/+1
| * | | | | cvsserver status: provide real sticky infoMatthew Ogilvie2012-10-162-4/+55
| * | | | | cvsserver: cvs add: do not expand directory argumentsMatthew Ogilvie2012-10-161-2/+0
| * | | | | cvsserver: use whole CVS rev number in-process; don't strip "1." prefixMatthew Ogilvie2012-10-162-104/+123
| * | | | | cvsserver: split up long lines in req_{status,diff,log}Matthew Ogilvie2012-10-161-61/+159
| * | | | | cvsserver: clean up client request handler map commentsMatthew Ogilvie2012-10-161-1/+4
| * | | | | cvsserver: remove unused functions _headrev and gethistoryMatthew Ogilvie2012-10-161-32/+4
| * | | | | cvsserver update: comment about how we shouldn't remove a user-modified fileMatthew Ogilvie2012-10-161-0/+4
| * | | | | cvsserver: add comments about database schema/usageMatthew Ogilvie2012-10-161-4/+42
| * | | | | cvsserver: removed unused sha1Or-k mode from kopts_from_pathMatthew Ogilvie2012-10-161-33/+5
| * | | | | cvsserver t9400: add basic 'cvs log' testMatthew Ogilvie2012-10-161-0/+70
* | | | | | Merge branch 'km/send-email-compose-encoding'Jeff King2012-11-093-5/+116
|\ \ \ \ \ \
| * | | | | | git-send-email: add rfc2047 quoting for "=?"Krzysztof Mazur2012-10-251-1/+1
| * | | | | | git-send-email: introduce quote_subject()Krzysztof Mazur2012-10-251-6/+19
| * | | | | | git-send-email: skip RFC2047 quoting for ASCII subjectsKrzysztof Mazur2012-10-252-1/+19
| * | | | | | git-send-email: use compose-encoding for SubjectKrzysztof Mazur2012-10-252-4/+18
| * | | | | | git-send-email: introduce compose-encodingKrzysztof Mazur2012-10-103-1/+67
* | | | | | | Merge branch 'js/format-2047'Jeff King2012-11-095-126/+262
|\ \ \ \ \ \ \
| * | | | | | | format-patch tests: check quoting/encoding in To: and Cc: headersJan H. Schönherr2012-10-181-32/+66
| * | | | | | | format-patch: fix rfc2047 address encoding with respect to rfc822 specialsJan H. Schönherr2012-10-182-18/+33
| * | | | | | | format-patch: make rfc2047 encoding more strictJan H. Schönherr2012-10-183-12/+72
| * | | | | | | format-patch: introduce helper function last_line_length()Jan H. Schönherr2012-10-181-12/+13