summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refactor get_textconv to not require diff_filespecJeff King2011-05-233-13/+20
* combine-diff: handle binary files as binaryJeff King2011-05-232-2/+148
* combine-diff: calculate mode_differs earlierJeff King2011-05-231-2/+7
* combine-diff: split header printing into its own functionJeff King2011-05-231-61/+74
* Merge branch 'maint'Junio C Hamano2011-05-202-1/+16
|\
| * git-svn: Fix git svn log --show-commitMichael J Gruber2011-05-202-1/+16
* | Update draft release notes to 1.7.6Junio C Hamano2011-05-191-1/+22
* | Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-190-0/+0
|\ \
| * \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+44
| |\ \
* | \ \ Merge branch 'rg/copy-gecos-username'Junio C Hamano2011-05-191-0/+1
|\ \ \ \
| * | | | copy_gecos: fix not adding nlen to len when processing "&"Rafael Gieschke2011-05-171-0/+1
* | | | | Merge branch 'jl/submodule-conflicted-gitmodules'Junio C Hamano2011-05-192-6/+117
|\ \ \ \ \
| * | | | | Submodules: Don't parse .gitmodules when it contains, merge conflictsJens Lehmann2011-05-142-5/+32
| * | | | | test that git status works with merge conflict in, .gitmodulesHeiko Voigt2011-05-141-4/+88
* | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-198-23/+45
|\ \ \ \ \ \
| * | | | | | read_sha1_file(): allow selective bypassing of replacement mechanismJunio C Hamano2011-05-152-5/+12
| * | | | | | inline lookup_replace_object() callsJunio C Hamano2011-05-153-4/+14
| * | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madnessJunio C Hamano2011-05-154-17/+9
| * | | | | | t6050: make sure we test not just commit replacementJunio C Hamano2011-05-151-2/+16
| * | | | | | Declare lookup_replace_object() in cache.h, not in commit.hJunio C Hamano2011-05-152-2/+1
* | | | | | | Merge branch 'nd/sparse-co-fix'Junio C Hamano2011-05-192-33/+83
|\ \ \ \ \ \ \
| * | | | | | | sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy2011-05-102-29/+75
| * | | | | | | t1011: fix sparse-checkout initialization and add new fileNguyễn Thái Ngọc Duy2011-05-101-4/+8
| |/ / / / / /
* | | | | | | Merge branch 'ld/p4-preserve-user-names'Junio C Hamano2011-05-193-38/+340
|\ \ \ \ \ \ \
| * | | | | | | git-p4: warn if git authorship won't be retainedLuke Diamand2011-05-133-2/+79
| * | | | | | | git-p4: small improvements to user-preservationLuke Diamand2011-05-091-5/+14
| * | | | | | | git-p4: add option to preserve user namesLuke Diamand2011-04-263-38/+254
* | | | | | | | Merge branch 'ms/tagname-does-not-begin-with-dash'Junio C Hamano2011-05-191-8/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | tag: disallow '-' as tag nameMichael Schubert2011-05-101-8/+18
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/git-connection-deadlock-fix'Junio C Hamano2011-05-194-14/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | test core.gitproxy configurationJeff King2011-05-181-0/+43
| * | | | | | | | send-pack: avoid deadlock on git:// push with failed pack-objectsJeff King2011-05-161-0/+2
| * | | | | | | | connect: let callers know if connection is a socketJeff King2011-05-162-1/+7
| * | | | | | | | connect: treat generic proxy processes like ssh processesJeff King2011-05-161-13/+15
* | | | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'Junio C Hamano2011-05-191-2/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-161-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | sideband_demux(): fix decl-after-stmtJunio C Hamano2011-05-161-2/+2
* | | | | | | | | | Merge branch 'jk/cherry-pick-root-with-resolve'Junio C Hamano2011-05-193-7/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3503: test cherry picking and reverting root commitsJeff King2011-05-161-2/+25
| * | | | | | | | | | revert: allow reverting a root commitJeff King2011-05-161-3/+1
| * | | | | | | | | | cherry-pick: handle root commits with external strategiesJeff King2011-05-161-2/+10
* | | | | | | | | | | Merge branch 'jc/maint-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-192-52/+45
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2011-05-112-52/+45
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | / / | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano2011-05-112-52/+45
* | | | | | | | | | | | Merge 1.7.5.2 inJunio C Hamano2011-05-192-1/+513
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Git 1.7.5.2v1.7.5.2Junio C Hamano2011-05-192-2/+3
| * | | | | | | | | | | provide a copy of the LGPLv2.1Jonathan Nieder2011-05-191-0/+511
* | | | | | | | | | | | Revert "Merge branch 'en/merge-recursive'"Junio C Hamano2011-05-192-81/+6
* | | | | | | | | | | | Makefile: sort TEST_PROGRAMS listJeff King2011-05-191-2/+2