aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* simplify output of conflicting mergeClemens Buchacher2009-04-05
* update cache for conflicting submodule entriesClemens Buchacher2009-04-05
* add tests for merging with submodulesClemens Buchacher2009-04-05
* GIT 1.6.2.2v1.6.2.2Junio C Hamano2009-04-02
* Merge branch 'jc/maint-1.6.0-blame-s' into maintJunio C Hamano2009-04-02
|\
| * blame: read custom grafts given by -S before calling setup_revisions()Junio C Hamano2009-03-18
* | Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2009-04-02
|\ \
| * | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-22
* | | Merge branch 'js/maint-1.6.0-exec-path-env' into maintJunio C Hamano2009-04-02
|\ \ \
| * | | Propagate --exec-path setting to external commands via GIT_EXEC_PATHJohannes Sixt2009-03-21
* | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2009-04-02
|\ \ \ \
| * | | | git-branch: display "was sha1" on branch deletion rather than just "sha1"Brandon Casey2009-03-21
* | | | | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maintJunio C Hamano2009-04-02
|\ \ \ \ \
| * | | | | Documentation: format-patch --root clarificationsThomas Rast2009-03-27
* | | | | | Merge branch 'dm/maint-docco' into maintJunio C Hamano2009-04-02
|\ \ \ \ \ \
| * | | | | | Documentation: Remove spurious uses of "you" in git-bisect.txt.David J. Mellor2009-03-25
| * | | | | | Documentation: minor grammatical fix in git-check-ref-format.txtDavid J. Mellor2009-03-22
| * | | | | | Documentation: minor grammatical fixes in git-check-attr.txtDavid J. Mellor2009-03-22
| * | | | | | Documentation: minor grammatical fixes in git-cat-file.txtDavid J. Mellor2009-03-22
| * | | | | | Documentation: minor grammatical fixes and rewording in git-bundle.txtDavid J. Mellor2009-03-22
| * | | | | | Documentation: remove some uses of the passive voice in git-bisect.txtDavid J. Mellor2009-03-22
| * | | | | | Documentation: reword example text in git-bisect.txt.David J. Mellor2009-03-20
| * | | | | | Documentation: reworded the "Description" section of git-bisect.txt.David J. Mellor2009-03-19
| * | | | | | Documentation: minor grammatical fixes in git-branch.txt.David J. Mellor2009-03-17
| * | | | | | Documentation: minor grammatical fixes in git-blame.txt.David J. Mellor2009-03-17
| * | | | | | Documentation: reword the "Description" section of git-bisect.txt.David J. Mellor2009-03-17
| * | | | | | Documentation: minor grammatical fixes in git-archive.txt.David J. Mellor2009-03-17
* | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-01
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-01
| |\ \ \ \ \ \ \
| | * | | | | | | Documentation: Remove an odd "instead"Holger Weiß2009-04-01
* | | | | | | | | fix portability problem with IS_RUN_COMMAND_ERRJeff King2009-04-01
* | | | | | | | | mailmap: resurrect lower-casing of email addressesJohannes Schindelin2009-04-01
* | | | | | | | | Update draft release notes to 1.6.2.2Junio C Hamano2009-03-30
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-30
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix bash completion in path with spacesDaniel Cheng (aka SDiZ)2009-03-30
| | * | | | | | | bash completion: only show 'log --merge' if mergingThomas Rast2009-03-30
| | * | | | | | | git-tag(1): add hint about commit messagesNico -telmich- Schottelius2009-03-30
| | * | | | | | | Documentation: update graph api example.Allan Caffee2009-03-30
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-29
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | import-zips: fix thinkoJohannes Schindelin2009-03-29
* | | | | | | | | git-svn: fix ls-tree usage with dash-prefixed pathsEric Wong2009-03-29
* | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-28
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | test-lib: Clean up comments and Makefile.Emil Sit2009-03-28
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | diff --no-index: Do not generate patch output if other output is requestedJohannes Sixt2009-03-25
* | | | | | | | documentation: update cvsimport description of "-r" for recent cloneCarlo Marcelo Arenas Belon2009-03-26
* | | | | | | | Increase the size of the die/warning buffer to avoid truncationShawn O. Pearce2009-03-24
* | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-24
| |\ \ \ \ \ \ \ | | |/ / / / / /