summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes for 1.6.1Junio C Hamano2008-08-201-5/+21
* Merge branch 'maint'Junio C Hamano2008-08-2018-23/+108
|\
| * Update draft release notes for 1.6.0.1Junio C Hamano2008-08-201-2/+18
| * Add hints to revert documentation about other ways to undo changesTarmigan Casebolt2008-08-201-0/+9
| * Install templates with the user and group of the installing personalityJohannes Sixt2008-08-201-1/+1
| * "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano2008-08-202-1/+11
| * completion: find out supported merge strategies correctlyJunio C Hamano2008-08-201-6/+8
| * decorate: allow const objects to be decoratedJeff King2008-08-202-8/+9
| * for-each-ref: cope with tags with incomplete linesJunio C Hamano2008-08-202-1/+13
| * diff --check: do not get confused by new blank lines in the middleJunio C Hamano2008-08-202-0/+12
| * remote.c: remove useless if-before-free testJim Meyering2008-08-191-2/+1
| * mailinfo: avoid violating strbuf assertionJeff King2008-08-194-1/+25
| * git format-patch: avoid underrun when format.headers is empty or all NLsJim Meyering2008-08-191-1/+1
* | Merge branch 'bd/diff-strbuf'Junio C Hamano2008-08-195-71/+53
|\ \
| * | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-145-39/+33
| * | Use strbuf for struct xdiff_emit_state's remainderBrian Downing2008-08-132-24/+12
| * | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-135-23/+23
* | | Merge branch 'dp/hash-literally'Junio C Hamano2008-08-195-122/+178
|\ \ \
| * | | add --no-filters option to git hash-objectDmitry Potapov2008-08-033-5/+44
| * | | add --path option to git hash-objectDmitry Potapov2008-08-033-7/+48
| * | | use parse_options() in git hash-objectDmitry Potapov2008-08-031-69/+53
| * | | correct usage help string for git-hash-objectDmitry Potapov2008-08-032-2/+5
| * | | correct argument checking test for git hash-objectDmitry Potapov2008-08-031-4/+4
| * | | teach index_fd to work with pipesDmitry Potapov2008-08-033-52/+41
* | | | Merge branch 'js/checkout-dwim-local'Junio C Hamano2008-08-193-4/+38
|\ \ \ \
| * | | | checkout --track: make up a sensible branch name if '-b' was omittedJohannes Schindelin2008-08-113-4/+38
* | | | | Merge branch 'ph/enable-threaded'Junio C Hamano2008-08-191-0/+5
|\ \ \ \ \
| * | | | | Enable threaded delta search on *BSD and Linux.Pierre Habouzit2008-07-221-0/+5
* | | | | | Merge branch 'jk/pager-swap'Junio C Hamano2008-08-193-44/+14
|\ \ \ \ \ \
| * | | | | | spawn pager via run_command interfaceJeff King2008-07-251-44/+11
| * | | | | | run-command: add pre-exec callbackJeff King2008-07-252-0/+3
* | | | | | | Merge branch 'rs/imap'Junio C Hamano2008-08-194-423/+586
|\ \ \ \ \ \ \
| * | | | | | | Documentation: Improve documentation for git-imap-send(1)Robert Shearman2008-07-251-12/+65
| * | | | | | | imap-send.c: more style fixesJunio C Hamano2008-07-251-114/+111
| * | | | | | | imap-send.c: style fixesRobert Shearman2008-07-251-329/+300
| * | | | | | | git-imap-send: Support SSLRobert Shearman2008-07-254-16/+156
| * | | | | | | git-imap-send: Allow the program to be run from subdirectories of a git treeRobert Shearman2008-07-251-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'js/mingw-stat'Junio C Hamano2008-08-195-43/+26
|\ \ \ \ \ \ \
| * | | | | | | Revert "Windows: Use a customized struct stat that also has the st_blocks mem...Johannes Sixt2008-08-182-32/+11
| * | | | | | | compat: introduce on_disk_bytes()Junio C Hamano2008-08-185-11/+15
* | | | | | | | reword --full-index descriptionJim Meyering2008-08-191-3/+3
* | | | | | | | SubmittingPatches: fix a typoJim Meyering2008-08-191-1/+1
* | | | | | | | add boolean diff.suppress-blank-empty config optionJim Meyering2008-08-193-0/+56
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-08-194-11/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'Brandon Casey2008-08-181-4/+6
| * | | | | | adapt git-cvsserver manpage to dash-free syntaxRobert Schiele2008-08-181-4/+4
| * | | | | | mailinfo: re-fix MIME multipart boundary parsingDon Zickus2008-08-182-3/+4
* | | | | | | Start 1.6.1 cycleJunio C Hamano2008-08-172-1/+43
|/ / / / / /
* | | | | | Start 1.6.0.X maintenance seriesJunio C Hamano2008-08-172-1/+16
* | | | | | GIT 1.6.0v1.6.0Junio C Hamano2008-08-173-13/+17