Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint | Junio C Hamano | 2013-02-07 | 3 | -17/+45 |
|\ | |||||
| * | apply: diagnose incomplete submodule object name better | Junio C Hamano | 2013-01-31 | 1 | -1/+5 |
| * | apply: simplify build_fake_ancestor() | Junio C Hamano | 2013-01-31 | 1 | -14/+12 |
| * | git-am: record full index line in the patch used while rebasing | Junio C Hamano | 2013-01-31 | 2 | -3/+29 |
* | | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint | Junio C Hamano | 2013-02-07 | 1 | -2/+3 |
|\ \ | |||||
| * | | Makefile: explicitly set target name for autogenerated dependencies | Jonathan Nieder | 2013-02-01 | 1 | -2/+3 |
* | | | Start preparing for 1.8.1.3 | Junio C Hamano | 2013-02-04 | 2 | -1/+29 |
* | | | Merge branch 'bc/git-p4-for-python-2.4' into maint | Junio C Hamano | 2013-02-04 | 3 | -11/+35 |
|\ \ \ | |||||
| * | | | INSTALL: git-p4 does not support Python 3 | Junio C Hamano | 2013-01-30 | 1 | -2/+3 |
| * | | | git-p4.py: support Python 2.4 | Brandon Casey | 2013-01-26 | 3 | -9/+31 |
| * | | | git-p4.py: support Python 2.5 | Brandon Casey | 2013-01-26 | 2 | -2/+3 |
* | | | | Merge branch 'nd/edit-branch-desc-while-detached' into maint | Junio C Hamano | 2013-02-04 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | branch: no detached HEAD check when editing another branch's description | Nguyễn Thái Ngọc Duy | 2013-01-30 | 1 | -4/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint | Junio C Hamano | 2013-02-04 | 1 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | ident: do not drop username when reading from /etc/mailname | Jonathan Nieder | 2013-01-25 | 1 | -1/+5 |
| |/ / / | |||||
* | | | | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint | Junio C Hamano | 2013-02-04 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | git-cvsimport.txt: cvsps-2 is deprecated | John Keeping | 2013-01-24 | 1 | -0/+6 |
* | | | | | Merge branch 'dl/am-hg-locale' into maint | Junio C Hamano | 2013-02-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | am: invoke perl's strftime in C locale | Dmitry V. Levin | 2013-01-18 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/help' into maint | Junio C Hamano | 2013-02-04 | 2 | -18/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | help: include <common-cmds.h> only in one file | Junio C Hamano | 2013-01-18 | 2 | -18/+17 |
* | | | | | | | Merge branch 'jc/merge-blobs' into maint | Junio C Hamano | 2013-02-04 | 8 | -51/+118 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Makefile: Replace merge-file.h with merge-blobs.h in LIB_H | Ramsay Jones | 2013-01-22 | 1 | -1/+1 |
| * | | | | | | | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 | 2 | -34/+42 |
| * | | | | | | | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 | 2 | -4/+66 |
| * | | | | | | | merge-tree: lose unused "resolve_directories" | Junio C Hamano | 2012-12-26 | 1 | -3/+0 |
| * | | | | | | | merge-tree: lose unused "flags" from merge_list | Junio C Hamano | 2012-12-26 | 1 | -2/+1 |
| * | | | | | | | Which merge_file() function do you mean? | Junio C Hamano | 2012-12-09 | 7 | -17/+18 |
* | | | | | | | | Merge branch 'jc/doc-maintainer' into maint | Junio C Hamano | 2013-02-04 | 1 | -91/+256 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | howto/maintain: document "### match next" convention in jch/pu branch | Junio C Hamano | 2013-01-25 | 1 | -5/+6 |
| * | | | | | | | | howto/maintain: mark titles for asciidoc | Junio C Hamano | 2013-01-03 | 1 | -3/+15 |
| * | | | | | | | | Documentation: update "howto maintain git" | Junio C Hamano | 2013-01-03 | 1 | -89/+241 |
* | | | | | | | | | Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maint | Junio C Hamano | 2013-02-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-completion.bash: replace zsh notation that breaks bash 3.X | Brandon Casey | 2013-01-18 | 1 | -1/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'tb/t0050-maint' into maint | Junio C Hamano | 2013-01-30 | 1 | -35/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t0050: Use TAB for indentation | Torsten Bögershausen | 2013-01-21 | 1 | -33/+15 |
| * | | | | | | | | | t0050: honor CASE_INSENSITIVE_FS in add (with different case) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
| * | | | | | | | | | t0050: known breakage vanished in merge (case change) | Torsten Bögershausen | 2013-01-21 | 1 | -1/+1 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'nd/fix-directory-attrs-off-by-one' into maint | Junio C Hamano | 2013-01-29 | 1 | -20/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | attr: avoid calling find_basename() twice per path | Duy Nguyen | 2013-01-16 | 1 | -27/+18 |
| * | | | | | | | | | attr: fix off-by-one directory component length calculation | Nguyễn Thái Ngọc Duy | 2013-01-15 | 1 | -0/+7 |
* | | | | | | | | | | Merge branch 'ph/rebase-preserve-all-merges' into maint | Junio C Hamano | 2013-01-29 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rebase --preserve-merges: keep all merge commits including empty ones | Phil Hord | 2013-01-14 | 1 | -1/+6 |
* | | | | | | | | | | | README: update stale and/or incorrect information | Junio C Hamano | 2013-01-29 | 1 | -8/+7 |
* | | | | | | | | | | | Git 1.8.1.2v1.8.1.2 | Junio C Hamano | 2013-01-28 | 2 | -1/+13 |
* | | | | | | | | | | | Merge branch 'ss/help-htmlpath-config-doc' into maint | Junio C Hamano | 2013-01-28 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | config.txt: Document help.htmlpath config parameter | Sebastian Staudt | 2013-01-15 | 1 | -0/+6 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'nd/attr-debug-fix' into maint | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | attr: make it build with DEBUG_ATTR again | Nguyễn Thái Ngọc Duy | 2013-01-15 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch 'ds/completion-silence-in-tree-path-probe' into maint | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |