Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 |
|\ | |||
| * | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 |
| * | diff: remove often unused parameters from diff_unmerge() | Junio C Hamano | 2011-04-23 |
| * | diff.c: return filepair from diff_unmerge() | Junio C Hamano | 2011-04-23 |
| * | test: use $_z40 from test-lib | Junio C Hamano | 2011-04-23 |
* | | Merge branch 'cj/p4merge' | Junio C Hamano | 2011-05-06 |
|\ \ | |||
| * | | Pass empty file to p4merge where no base is suitable. | Ciaran Jessup | 2011-05-01 |
* | | | Merge branch 'gr/cvsimport-alternative-cvspass-location' | Junio C Hamano | 2011-05-06 |
|\ \ \ | |||
| * | | | Look for password in both CVS and CVSNT password files. | Guy Rouillier | 2011-05-01 |
* | | | | Merge branch 'sg/completion-cleanup' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ | |||
| * | | | | completion: remove unnecessary _get_comp_words_by_ref() invocations | SZEDER Gábor | 2011-04-28 |
| * | | | | completion: don't modify the $cur variable in completion functions | SZEDER Gábor | 2011-04-28 |
* | | | | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ | |||
| * | | | | | t/annotate-tests: Use echo & cat instead of sed | Brian Gernhardt | 2011-05-05 |
| * | | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'jk/format-patch-quote-special-in-from' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ | |||
| * | | | | | pretty: quote rfc822 specials in email addresses | Jeff King | 2011-04-26 |
* | | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ | |||
| * | | | | | | pathspec: rename per-item field has_wildcard to use_wildcard | Junio C Hamano | 2011-04-05 |
| * | | | | | | Improve tree_entry_interesting() handling code | Nguyễn Thái Ngọc Duy | 2011-03-25 |
| * | | | | | | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 |
| * | | | | | | Reimplement read_tree_recursive() using tree_entry_interesting() | Nguyễn Thái Ngọc Duy | 2011-03-25 |
| * | | | | | | Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec' | Junio C Hamano | 2011-03-25 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'aw/maint-rebase-i-p-no-ff' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff | Andrew Wong | 2011-04-28 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'mg/alias-expose-prefix' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | handle_alias: provide GIT_PREFIX to !alias | Michael J Gruber | 2011-04-27 |
| * | | | | | | | | t1020: test !alias in subdirectory | Michael J Gruber | 2011-04-27 |
| | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'mg/diff-uiconfig-doc' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | config.txt,diff-options.txt: porcelain vs. plumbing for color.diff | Michael J Gruber | 2011-04-27 |
| |/ / / / / / / | |||
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Remove duplicated "is a" | João Britto | 2011-05-05 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-05 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||
| * | | | | | | | | t3701: fix here document | Junio C Hamano | 2011-05-05 |
| * | | | | | | | | git-fast-import.txt: --relative-marks takes no parameter | Michael J Gruber | 2011-05-05 |
| * | | | | | | | | shell: add missing initialization of argv0_path | Dima Sharov | 2011-05-05 |
* | | | | | | | | | Update draft release notes to 1.7.6 | Junio C Hamano | 2011-05-04 |
* | | | | | | | | | Merge branch 'ml/test-readme' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t/README: unify documentation of test function args | Mathias Lafeldt | 2011-04-26 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'ft/gitweb-tar-with-gzip-n' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | gitweb: supply '-n' to gzip for identical output | Fraser Tweedale | 2011-04-26 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'mg/rev-list-count-cherry' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | rev-list --count: separate count for --cherry-mark | Michael J Gruber | 2011-04-26 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'ss/doc-svn' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | remove noise and inaccuracies from git-svn docs | Stefan Sperling | 2011-04-19 |
* | | | | | | | | | | Merge branch 'jn/format-patch-doc' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird | Johannes Sixt | 2011-04-19 |
| * | | | | | | | | | | Documentation: publicize hints for sending patches with GMail | Jonathan Nieder | 2011-04-15 |
| * | | | | | | | | | | Documentation: publicize KMail hints for sending patches inline | Jonathan Nieder | 2011-04-15 |
| * | | | | | | | | | | Documentation: hints for sending patches inline with Thunderbird | Jonathan Nieder | 2011-04-15 |