summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-165-83/+376
|\
| * combine-diff: respect textconv attributesJeff King2011-05-242-9/+131
| * 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
* | am: refresh the index at start and --resolvedJeff King2011-08-161-0/+2
* | filter-branch: Export variable `workdir' for --commit-filterMichael Witten2011-08-081-1/+1
* | Documentation/Makefile: add *.pdf to `clean' targetEmilio G. Cota2011-08-081-0/+1
* | Documentation: ignore *.pdf filesEmilio G. Cota2011-08-081-0/+1
* | add gitignore entry to description about how to write a builtinHeiko Voigt2011-08-031-0/+2
* | gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty2011-08-031-9/+9
* | gitattributes: Clarify discussion of attribute macrosMichael Haggerty2011-08-031-5/+8
* | Merge branch 'nk/ref-doc' into maintJunio C Hamano2011-08-014-30/+34
|\ \
| * | glossary: clarify description of HEADJunio C Hamano2011-06-231-2/+2
| * | glossary: update description of head and refJunio C Hamano2011-06-231-4/+5
| * | glossary: update description of "tag"Junio C Hamano2011-06-231-8/+8
| * | git.txt: de-emphasize the implementation detail of a refJunio C Hamano2011-06-231-4/+3
| * | check-ref-format doc: de-emphasize the implementation detail of a refJunio C Hamano2011-06-231-3/+6
| * | git-remote.txt: avoid sounding as if loose refs are the only ones in the worldJunio C Hamano2011-06-231-9/+10
| * | git-remote.txt: fix wrong remote refspecNamhyung Kim2011-06-231-6/+6
* | | Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano2011-08-012-8/+9
|\ \ \
| * | | fetch: Also fetch submodules in subdirectories in on-demand modeJens Lehmann2011-06-202-8/+9
* | | | Merge branch 'jc/maint-cygwin-trust-executable-bit-default' into maintJunio C Hamano2011-08-011-1/+1
|\ \ \ \
| * | | | cygwin: trust executable bit by defaultJunio C Hamano2011-06-201-1/+1
| |/ / /
* | | | Merge branch 'jc/legacy-loose-object' into maintJunio C Hamano2011-08-011-29/+33
|\ \ \ \
| * | | | sha1_file.c: "legacy" is really the current formatJunio C Hamano2011-06-081-29/+33
* | | | | Merge branch 'an/shallow-doc' into maintJunio C Hamano2011-08-011-29/+74
|\ \ \ \ \
| * | | | | Document the underlying protocol used by shallow repositories and --depth com...Alex Neronskiy2011-06-081-22/+66
| * | | | | Fix documentation of fetch-pack that implies that the client can disconnect a...Alex Neronskiy2011-06-081-14/+15
* | | | | | Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano2011-08-014-1/+19
|\ \ \ \ \ \
| * | | | | | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-054-1/+19
* | | | | | | connect: correctly number ipv6 network adapterErik Faye-Lund2011-08-011-1/+1
* | | | | | | Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy2011-07-311-2/+13
* | | | | | | t7400: fix bogus test failure with symlinked trashJeff King2011-07-311-2/+4
* | | | | | | Documentation: clarify the invalidated tree entry formatCarlos Martín Nieto2011-07-311-2/+3
* | | | | | | tests: print failed test numbers at the end of the test runJens Lehmann2011-07-241-1/+13
* | | | | | | doc/fast-import: clarify notemodify commandDmitry Ivankov2011-07-221-3/+8
* | | | | | | Documentation: minor grammatical fix in rev-list-options.txtJack Nagel2011-07-221-1/+1
* | | | | | | Documentation: git-filter-branch honors replacement refsPeter Collingbourne2011-07-211-2/+3
* | | | | | | remote-curl: Add a format check to parsing of info/refsJulian Phillips2011-07-201-0/+2
* | | | | | | git-config: Remove extra whitespacesPavan Kumar Sunkara2011-07-191-2/+2
* | | | | | | docs: document --textconv diff optionJeff King2011-07-061-0/+11
* | | | | | | Merge git://bogomips.org/git-svn into maintJunio C Hamano2011-06-292-4/+41
|\ \ \ \ \ \ \
| * | | | | | | git-svn: Correctly handle root commits in mergeinfo rangesMichael Haggerty2011-06-282-3/+7
| * | | | | | | git-svn: Disambiguate rev-list arguments to improve error messageMichael Haggerty2011-06-281-2/+2
| * | | | | | | git-svn: Demonstrate a bug with root commits in mergeinfo rangesMichael Haggerty2011-06-281-0/+33
* | | | | | | | Merge branch 'maint-1.7.5' into maintJunio C Hamano2011-06-292-3/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | test: skip clean-up when running under --immediate modeJunio C Hamano2011-06-291-2/+10
| * | | | | | | "branch -d" can remove more than one branchesJunio C Hamano2011-06-291-1/+1