summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/fake-ancestor-with-non-blobs' into maintJunio C Hamano2013-02-073-17/+45
|\
| * apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-311-1/+5
| * apply: simplify build_fake_ancestor()Junio C Hamano2013-01-311-14/+12
| * git-am: record full index line in the patch used while rebasingJunio C Hamano2013-01-312-3/+29
* | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maintJunio C Hamano2013-02-071-2/+3
|\ \
| * | Makefile: explicitly set target name for autogenerated dependenciesJonathan Nieder2013-02-011-2/+3
* | | Start preparing for 1.8.1.3Junio C Hamano2013-02-042-1/+29
* | | Merge branch 'bc/git-p4-for-python-2.4' into maintJunio C Hamano2013-02-043-11/+35
|\ \ \
| * | | INSTALL: git-p4 does not support Python 3Junio C Hamano2013-01-301-2/+3
| * | | git-p4.py: support Python 2.4Brandon Casey2013-01-263-9/+31
| * | | git-p4.py: support Python 2.5Brandon Casey2013-01-262-2/+3
* | | | Merge branch 'nd/edit-branch-desc-while-detached' into maintJunio C Hamano2013-02-041-4/+4
|\ \ \ \
| * | | | branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-301-4/+4
| | |/ / | |/| |
* | | | Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maintJunio C Hamano2013-02-041-1/+5
|\ \ \ \
| * | | | ident: do not drop username when reading from /etc/mailnameJonathan Nieder2013-01-251-1/+5
| |/ / /
* | | | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maintJunio C Hamano2013-02-041-0/+6
|\ \ \ \
| * | | | git-cvsimport.txt: cvsps-2 is deprecatedJohn Keeping2013-01-241-0/+6
* | | | | Merge branch 'dl/am-hg-locale' into maintJunio C Hamano2013-02-041-1/+1
|\ \ \ \ \
| * | | | | am: invoke perl's strftime in C localeDmitry V. Levin2013-01-181-1/+1
* | | | | | Merge branch 'jc/help' into maintJunio C Hamano2013-02-042-18/+17
|\ \ \ \ \ \
| * | | | | | help: include <common-cmds.h> only in one fileJunio C Hamano2013-01-182-18/+17
* | | | | | | Merge branch 'jc/merge-blobs' into maintJunio C Hamano2013-02-048-51/+118
|\ \ \ \ \ \ \
| * | | | | | | Makefile: Replace merge-file.h with merge-blobs.h in LIB_HRamsay Jones2013-01-221-1/+1
| * | | | | | | merge-tree: fix d/f conflictsJunio C Hamano2012-12-262-34/+42
| * | | | | | | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-262-4/+66
| * | | | | | | merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
| * | | | | | | merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
| * | | | | | | Which merge_file() function do you mean?Junio C Hamano2012-12-097-17/+18
* | | | | | | | Merge branch 'jc/doc-maintainer' into maintJunio C Hamano2013-02-041-91/+256
|\ \ \ \ \ \ \ \
| * | | | | | | | howto/maintain: document "### match next" convention in jch/pu branchJunio C Hamano2013-01-251-5/+6
| * | | | | | | | howto/maintain: mark titles for asciidocJunio C Hamano2013-01-031-3/+15
| * | | | | | | | Documentation: update "howto maintain git"Junio C Hamano2013-01-031-89/+241
* | | | | | | | | Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maintJunio C Hamano2013-02-041-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-completion.bash: replace zsh notation that breaks bash 3.XBrandon Casey2013-01-181-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tb/t0050-maint' into maintJunio C Hamano2013-01-301-35/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0050: Use TAB for indentationTorsten Bögershausen2013-01-211-33/+15
| * | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case)Torsten Bögershausen2013-01-211-1/+1
| * | | | | | | | | t0050: known breakage vanished in merge (case change)Torsten Bögershausen2013-01-211-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/fix-directory-attrs-off-by-one' into maintJunio C Hamano2013-01-291-20/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | attr: avoid calling find_basename() twice per pathDuy Nguyen2013-01-161-27/+18
| * | | | | | | | | attr: fix off-by-one directory component length calculationNguyễn Thái Ngọc Duy2013-01-151-0/+7
* | | | | | | | | | Merge branch 'ph/rebase-preserve-all-merges' into maintJunio C Hamano2013-01-291-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase --preserve-merges: keep all merge commits including empty onesPhil Hord2013-01-141-1/+6
* | | | | | | | | | | README: update stale and/or incorrect informationJunio C Hamano2013-01-291-8/+7
* | | | | | | | | | | Git 1.8.1.2v1.8.1.2Junio C Hamano2013-01-282-1/+13
* | | | | | | | | | | Merge branch 'ss/help-htmlpath-config-doc' into maintJunio C Hamano2013-01-281-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config.txt: Document help.htmlpath config parameterSebastian Staudt2013-01-151-0/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/attr-debug-fix' into maintJunio C Hamano2013-01-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | attr: make it build with DEBUG_ATTR againNguyễn Thái Ngọc Duy2013-01-151-1/+1
* | | | | | | | | | | | Merge branch 'ds/completion-silence-in-tree-path-probe' into maintJunio C Hamano2013-01-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \