summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* tests: add date printing and parsing testsJeff King2009-08-301-0/+75
* refactor test-date interfaceJeff King2009-08-301-8/+55
* Add date formatting and parsing functions relative to a given timeAlex Riesen2009-08-302-63/+92
* Further 'approxidate' improvementsLinus Torvalds2009-08-221-5/+27
* Improve on 'approxidate'Linus Torvalds2009-08-221-30/+63
* Sync with 1.6.4.1Junio C Hamano2009-08-212-1/+48
|\
| * GIT 1.6.4.1v1.6.4.1Junio C Hamano2009-08-214-3/+50
| * Merge branch 'bc/maint-am-email' into maintJunio C Hamano2009-08-212-1/+34
| |\
| * \ Merge branch 'jc/maint-merge-recursive-fix' into maintJunio C Hamano2009-08-212-3/+80
| |\ \
| * \ \ Merge branch 'zf/maint-gitweb-acname' into maintJunio C Hamano2009-08-211-3/+2
| |\ \ \
| * \ \ \ Merge branch 'np/maint-limit-delta-cache' into maintJunio C Hamano2009-08-212-4/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/maint-show-tag' into maintJunio C Hamano2009-08-211-1/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sb/maint-pull-rebase' into maintJunio C Hamano2009-08-212-3/+24
| |\ \ \ \ \ \
* | | | | | | | compat/snprintf.c: clarify SNPRINTF_SIZE_CORRJunio C Hamano2009-08-211-1/+2
* | | | | | | | Merge branch 'cc/replace'Junio C Hamano2009-08-2123-13/+610
|\ \ \ \ \ \ \ \
| * | | | | | | | t6050: check pushing something based on a replaced commitChristian Couder2009-05-311-0/+68
| * | | | | | | | Documentation: add documentation for "git replace"Christian Couder2009-05-311-0/+71
| * | | | | | | | Add git-replace to .gitignoreDavid Aguilar2009-05-311-0/+1
| * | | | | | | | builtin-replace: use "usage_msg_opt" to give better error messagesChristian Couder2009-05-311-6/+12
| * | | | | | | | parse-options: add new function "usage_msg_opt"Christian Couder2009-05-313-1/+13
| * | | | | | | | builtin-replace: teach "git replace" to actually replaceChristian Couder2009-05-312-1/+59
| * | | | | | | | Add new "git replace" commandChristian Couder2009-05-315-0/+120
| * | | | | | | | environment: add global variable to disable replacementChristian Couder2009-05-319-0/+35
| * | | | | | | | mktag: call "check_sha1_signature" with the replacement sha1Christian Couder2009-05-312-3/+16
| * | | | | | | | replace_object: add a test caseChristian Couder2009-05-311-0/+75
| * | | | | | | | object: call "check_sha1_signature" with the replacement sha1Christian Couder2009-05-311-4/+5
| * | | | | | | | sha1_file: add a "read_sha1_file_repl" functionChristian Couder2009-05-312-3/+12
| * | | | | | | | replace_object: add mechanism to replace objects found in "refs/replace/"Christian Couder2009-05-314-3/+125
| * | | | | | | | refs: add a "for_each_replace_ref" functionChristian Couder2009-05-312-0/+6
* | | | | | | | | Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-2111-10/+389
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-0511-10/+389
* | | | | | | | | | Merge branch 'bc/mailsplit-cr-at-eol'Junio C Hamano2009-08-217-43/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow mailsplit (and hence git-am) to handle mails with CRLF line-endingsJunio C Hamano2009-08-053-3/+40
| * | | | | | | | | | builtin-mailsplit.c: remove read_line_with_nul() since it is no longer usedBrandon Casey2009-08-052-19/+0
| * | | | | | | | | | builtin-mailinfo,builtin-mailsplit: use strbufsBrandon Casey2009-08-052-19/+9
| * | | | | | | | | | strbuf: add new function strbuf_getwholeline()Brandon Casey2009-08-052-3/+13
| |/ / / / / / / / /
* | | | | | | | | | Make test number t7406- uniqueJohannes Sixt2009-08-211-0/+0
* | | | | | | | | | git-compat-util.h: remove superfluous test for __sun__Brandon Casey2009-08-191-2/+0
* | | | | | | | | | Merge branch 'rc/maint-http-fix'Junio C Hamano2009-08-181-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http.c: don't assume that urls don't end with slashTay Ray Chuan2009-08-181-1/+3
* | | | | | | | | | | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'Junio C Hamano2009-08-182-0/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add -p: do not attempt to coalesce mode changesThomas Rast2009-08-152-1/+5
| * | | | | | | | | | | git add -p: demonstrate failure when staging both mode and hunkKirill Smelkov2009-08-151-0/+11
* | | | | | | | | | | | graph API: use a new color when starting a brand new columnAdam Simpkins2009-08-181-3/+11
* | | | | | | | | | | | git-svn: Use GIT_SSH setting if SVN_SSH is not setKarthik R2009-08-181-0/+9
* | | | | | | | | | | | svn: assume URLs from the command-line are URI-encodedEric Wong2009-08-182-0/+54
* | | | | | | | | | | | git-svn.txt: Fix location of parent argumentTuomas Suutari2009-08-181-3/+3
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-08-183-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | filter-branch: make the usage string fit on 80 chars terminals.Matthieu Moy2009-08-181-6/+6
| * | | | | | | | | | | filter-branch: add an example how to add ACKs to a range of commitsJohannes Schindelin2009-08-181-0/+10
| | |/ / / / / / / / / | |/| | | | | | | | |