summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-0615-172/+151
|\
| * pathspec: rename per-item field has_wildcard to use_wildcardJunio C Hamano2011-04-055-8/+9
| * Improve tree_entry_interesting() handling codeNguyễn Thái Ngọc Duy2011-03-253-50/+33
| * Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-259-29/+62
| * Reimplement read_tree_recursive() using tree_entry_interesting()Nguyễn Thái Ngọc Duy2011-03-251-95/+57
| * Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'Junio C Hamano2011-03-252-2/+79
| |\
* | \ Merge branch 'aw/maint-rebase-i-p-no-ff'Junio C Hamano2011-05-062-2/+32
|\ \ \
| * | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2011-04-282-2/+32
* | | | Merge branch 'mg/alias-expose-prefix'Junio C Hamano2011-05-063-1/+32
|\ \ \ \
| * | | | handle_alias: provide GIT_PREFIX to !aliasMichael J Gruber2011-04-273-1/+21
| * | | | t1020: test !alias in subdirectoryMichael J Gruber2011-04-271-0/+11
* | | | | Merge branch 'mg/diff-uiconfig-doc'Junio C Hamano2011-05-062-12/+30
|\ \ \ \ \
| * | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber2011-04-272-12/+30
| |/ / / /
* | | | | Merge branch 'maint'Junio C Hamano2011-05-061-1/+1
|\ \ \ \ \
| * | | | | Remove duplicated "is a"João Britto2011-05-051-1/+1
* | | | | | Merge branch 'maint'Junio C Hamano2011-05-053-5/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | t3701: fix here documentJunio C Hamano2011-05-051-3/+2
| * | | | | git-fast-import.txt: --relative-marks takes no parameterMichael J Gruber2011-05-051-2/+2
| * | | | | shell: add missing initialization of argv0_pathDima Sharov2011-05-051-0/+2
* | | | | | Update draft release notes to 1.7.6Junio C Hamano2011-05-041-27/+13
* | | | | | Merge branch 'ml/test-readme'Junio C Hamano2011-05-041-8/+9
|\ \ \ \ \ \
| * | | | | | t/README: unify documentation of test function argsMathias Lafeldt2011-04-261-8/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ft/gitweb-tar-with-gzip-n'Junio C Hamano2011-05-041-1/+1
|\ \ \ \ \ \
| * | | | | | gitweb: supply '-n' to gzip for identical outputFraser Tweedale2011-04-261-1/+1
| |/ / / / /
* | | | | | Merge branch 'mg/rev-list-count-cherry'Junio C Hamano2011-05-044-3/+40
|\ \ \ \ \ \
| * | | | | | rev-list --count: separate count for --cherry-markMichael J Gruber2011-04-264-3/+40
| |/ / / / /
* | | | | | Merge branch 'ss/doc-svn'Junio C Hamano2011-05-041-9/+7
|\ \ \ \ \ \
| * | | | | | remove noise and inaccuracies from git-svn docsStefan Sperling2011-04-191-9/+7
* | | | | | | Merge branch 'jn/format-patch-doc'Junio C Hamano2011-05-044-195/+229
|\ \ \ \ \ \ \
| * | | | | | | Documentation/format-patch: suggest Toggle Word Wrap add-on for ThunderbirdJohannes Sixt2011-04-191-4/+14
| * | | | | | | Documentation: publicize hints for sending patches with GMailJonathan Nieder2011-04-154-55/+61
| * | | | | | | Documentation: publicize KMail hints for sending patches inlineJonathan Nieder2011-04-152-20/+18
| * | | | | | | Documentation: hints for sending patches inline with ThunderbirdJonathan Nieder2011-04-152-80/+84
| * | | | | | | Documentation: explain how to check for patch corruptionJonathan Nieder2011-04-152-44/+60
| * | | | | | | Merge v1.7.5-rc2 into jn/format-patch-docJunio C Hamano2011-04-15431-4909/+12524
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'vr/merge-base-doc'Junio C Hamano2011-05-042-14/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Restructure documentation for git-merge-base.Jonathan Nieder2011-04-151-12/+16
| * | | | | | | | | Documentation: update to git-merge-base --octopusVincent van Ravesteijn2011-04-152-2/+7
* | | | | | | | | | Merge branch 'ss/cherry-pick-x-doc'Junio C Hamano2011-05-041-3/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: Clarify that "cherry-pick -x" does not use "git notes"Sebastian Schuberth2011-04-151-3/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jn/maint-format-patch-doc'Junio C Hamano2011-05-041-0/+58
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Documentation: describe the format of messages with inline patchesJonathan Nieder2011-04-151-0/+58
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/format-patch-multiline-header'Junio C Hamano2011-05-042-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: wrap email addresses after long namesJeff King2011-04-142-0/+24
* | | | | | | | | | Merge branch 'jm/mergetool-submodules'Junio C Hamano2011-05-042-9/+371
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetool: Teach about submodulesJonathon Mah2011-04-132-9/+371
* | | | | | | | | | | Sync with 1.7.5.1Junio C Hamano2011-05-043-1/+37
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Git 1.7.5.1v1.7.5.1Junio C Hamano2011-05-043-2/+36
| * | | | | | | | | | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-048-12/+81
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-clear-postfields' into maintJunio C Hamano2011-05-041-0/+1
| |\ \ \ \ \ \ \ \ \ \ \