Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 | 15 | -172/+151 |
|\ | |||||
| * | pathspec: rename per-item field has_wildcard to use_wildcard | Junio C Hamano | 2011-04-05 | 5 | -8/+9 |
| * | Improve tree_entry_interesting() handling code | Nguyễn Thái Ngọc Duy | 2011-03-25 | 3 | -50/+33 |
| * | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 | 9 | -29/+62 |
| * | Reimplement read_tree_recursive() using tree_entry_interesting() | Nguyễn Thái Ngọc Duy | 2011-03-25 | 1 | -95/+57 |
| * | Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec' | Junio C Hamano | 2011-03-25 | 2 | -2/+79 |
| |\ | |||||
* | \ | Merge branch 'aw/maint-rebase-i-p-no-ff' | Junio C Hamano | 2011-05-06 | 2 | -2/+32 |
|\ \ \ | |||||
| * | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff | Andrew Wong | 2011-04-28 | 2 | -2/+32 |
* | | | | Merge branch 'mg/alias-expose-prefix' | Junio C Hamano | 2011-05-06 | 3 | -1/+32 |
|\ \ \ \ | |||||
| * | | | | handle_alias: provide GIT_PREFIX to !alias | Michael J Gruber | 2011-04-27 | 3 | -1/+21 |
| * | | | | t1020: test !alias in subdirectory | Michael J Gruber | 2011-04-27 | 1 | -0/+11 |
* | | | | | Merge branch 'mg/diff-uiconfig-doc' | Junio C Hamano | 2011-05-06 | 2 | -12/+30 |
|\ \ \ \ \ | |||||
| * | | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diff | Michael J Gruber | 2011-04-27 | 2 | -12/+30 |
| |/ / / / | |||||
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove duplicated "is a" | João Britto | 2011-05-05 | 1 | -1/+1 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-05 | 3 | -5/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | t3701: fix here document | Junio C Hamano | 2011-05-05 | 1 | -3/+2 |
| * | | | | | git-fast-import.txt: --relative-marks takes no parameter | Michael J Gruber | 2011-05-05 | 1 | -2/+2 |
| * | | | | | shell: add missing initialization of argv0_path | Dima Sharov | 2011-05-05 | 1 | -0/+2 |
* | | | | | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-04 | 1 | -27/+13 |
* | | | | | | Merge branch 'ml/test-readme' | Junio C Hamano | 2011-05-04 | 1 | -8/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/README: unify documentation of test function args | Mathias Lafeldt | 2011-04-26 | 1 | -8/+9 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'ft/gitweb-tar-with-gzip-n' | Junio C Hamano | 2011-05-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: supply '-n' to gzip for identical output | Fraser Tweedale | 2011-04-26 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mg/rev-list-count-cherry' | Junio C Hamano | 2011-05-04 | 4 | -3/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-list --count: separate count for --cherry-mark | Michael J Gruber | 2011-04-26 | 4 | -3/+40 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ss/doc-svn' | Junio C Hamano | 2011-05-04 | 1 | -9/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove noise and inaccuracies from git-svn docs | Stefan Sperling | 2011-04-19 | 1 | -9/+7 |
* | | | | | | | Merge branch 'jn/format-patch-doc' | Junio C Hamano | 2011-05-04 | 4 | -195/+229 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird | Johannes Sixt | 2011-04-19 | 1 | -4/+14 |
| * | | | | | | | Documentation: publicize hints for sending patches with GMail | Jonathan Nieder | 2011-04-15 | 4 | -55/+61 |
| * | | | | | | | Documentation: publicize KMail hints for sending patches inline | Jonathan Nieder | 2011-04-15 | 2 | -20/+18 |
| * | | | | | | | Documentation: hints for sending patches inline with Thunderbird | Jonathan Nieder | 2011-04-15 | 2 | -80/+84 |
| * | | | | | | | Documentation: explain how to check for patch corruption | Jonathan Nieder | 2011-04-15 | 2 | -44/+60 |
| * | | | | | | | Merge v1.7.5-rc2 into jn/format-patch-doc | Junio C Hamano | 2011-04-15 | 431 | -4909/+12524 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'vr/merge-base-doc' | Junio C Hamano | 2011-05-04 | 2 | -14/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Restructure documentation for git-merge-base. | Jonathan Nieder | 2011-04-15 | 1 | -12/+16 |
| * | | | | | | | | | Documentation: update to git-merge-base --octopus | Vincent van Ravesteijn | 2011-04-15 | 2 | -2/+7 |
* | | | | | | | | | | Merge branch 'ss/cherry-pick-x-doc' | Junio C Hamano | 2011-05-04 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | doc: Clarify that "cherry-pick -x" does not use "git notes" | Sebastian Schuberth | 2011-04-15 | 1 | -3/+4 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'jn/maint-format-patch-doc' | Junio C Hamano | 2011-05-04 | 1 | -0/+58 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Documentation: describe the format of messages with inline patches | Jonathan Nieder | 2011-04-15 | 1 | -0/+58 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/format-patch-multiline-header' | Junio C Hamano | 2011-05-04 | 2 | -0/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | format-patch: wrap email addresses after long names | Jeff King | 2011-04-14 | 2 | -0/+24 |
* | | | | | | | | | | Merge branch 'jm/mergetool-submodules' | Junio C Hamano | 2011-05-04 | 2 | -9/+371 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 | 2 | -9/+371 |
* | | | | | | | | | | | Sync with 1.7.5.1 | Junio C Hamano | 2011-05-04 | 3 | -1/+37 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Git 1.7.5.1v1.7.5.1 | Junio C Hamano | 2011-05-04 | 3 | -2/+36 |
| * | | | | | | | | | | Merge branch 'jh/dirstat' into maint | Junio C Hamano | 2011-05-04 | 8 | -12/+81 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-clear-postfields' into maint | Junio C Hamano | 2011-05-04 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ |