Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | daemon: allow more than one host address given via --listen | Alexander Sulfrian | 2010-09-28 | 2 | -9/+23 | |
| * | | | | | | | | daemon: add helper function named_sock_setup | Alexander Sulfrian | 2010-09-28 | 1 | -20/+33 | |
* | | | | | | | | | Merge branch 'dm/mergetool-vimdiff' | Junio C Hamano | 2010-10-27 | 1 | -10/+16 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | mergetool-lib: make the three-way diff the default for vim/gvim | Dan McGee | 2010-09-29 | 1 | -3/+15 | |
| * | | | | | | | | | mergetool-lib: add a three-way diff view for vim/gvim | Dan McGee | 2010-09-15 | 1 | -2/+7 | |
| * | | | | | | | | | mergetool-lib: combine vimdiff and gvimdiff run blocks | Dan McGee | 2010-09-15 | 1 | -14/+3 | |
* | | | | | | | | | | Merge branch 'kf/post-receive-sample-hook' | Junio C Hamano | 2010-10-27 | 1 | -16/+31 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | post-receive-email: ensure sent messages are not empty | Kevin P. Fleming | 2010-09-10 | 1 | -16/+31 | |
* | | | | | | | | | | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-27 | 12 | -97/+351 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | merge-recursive: options to ignore whitespace changes | Justin Frankel | 2010-08-27 | 3 | -0/+207 | |
| * | | | | | | | | | | merge-recursive --patience | Justin Frankel | 2010-08-26 | 6 | -0/+14 | |
| * | | | | | | | | | | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 7 | -66/+104 | |
| * | | | | | | | | | | merge-recursive: expose merge options for builtin merge | Jonathan Nieder | 2010-08-26 | 4 | -31/+26 | |
* | | | | | | | | | | | Merge branch 'ml/completion-zsh' | Junio C Hamano | 2010-10-27 | 1 | -4/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | completion: make compatible with zsh | Mark Lodato | 2010-09-10 | 1 | -4/+46 | |
* | | | | | | | | | | | | Merge branch 'po/sendemail' | Junio C Hamano | 2010-10-27 | 3 | -3/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | New send-email option smtpserveroption. | Pascal Obry | 2010-09-07 | 3 | -1/+17 | |
| * | | | | | | | | | | | | Remove @smtp_host_parts variable as not used. | Pascal Obry | 2010-09-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Minor indentation fix. | Pascal Obry | 2010-09-07 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'en/tree-walk-optim' | Junio C Hamano | 2010-10-27 | 1 | -14/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | diff_tree(): Skip skip_uninteresting() when all remaining paths interesting | Elijah Newren | 2010-08-26 | 1 | -13/+12 | |
| * | | | | | | | | | | | | | tree_entry_interesting(): Make return value more specific | Elijah Newren | 2010-08-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | tree-walk: Correct bitrotted comment about tree_entry() | Elijah Newren | 2010-08-26 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | Document pre-condition for tree_entry_interesting | Elijah Newren | 2010-08-26 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-10-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix copy-pasted comments related to tree diff handling. | Yann Dirson | 2010-10-25 | 1 | -2/+2 | |
* | | | | | | | | | | | | | Sync with 1.7.3.2 | Junio C Hamano | 2010-10-22 | 57 | -158/+167 | |
|\| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Git 1.7.3.2v1.7.3.2 | Junio C Hamano | 2010-10-22 | 4 | -3/+9 | |
| * | | | | | | | | | | | | Merge branch 'sn/doc-opt-notation' into maint | Junio C Hamano | 2010-10-22 | 55 | -157/+157 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix {update,checkout}-index usage strings | Štěpán Němec | 2010-10-08 | 2 | -2/+2 | |
| | * | | | | | | | | | | | | Put a space between `<' and argument in pack-objects usage string | Štěpán Němec | 2010-10-08 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | Remove stray quotes in --pretty and --format documentation | Štěpán Němec | 2010-10-08 | 2 | -3/+3 | |
| | * | | | | | | | | | | | | Use parentheses and `...' where appropriate | Štěpán Němec | 2010-10-08 | 31 | -33/+33 | |
| | * | | | | | | | | | | | | Fix odd markup in --diff-filter documentation | Štěpán Němec | 2010-10-08 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | Use angles for placeholders consistently | Štěpán Němec | 2010-10-08 | 27 | -118/+118 | |
| * | | | | | | | | | | | | | Merge branch 'mg/fix-build-remote-helpers' into maint | Junio C Hamano | 2010-10-22 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | remote-helpers: build in platform independent directory | Michael J Gruber | 2010-09-27 | 1 | -0/+3 | |
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | {cvs,svn}import: use the new 'git read-tree --empty' | Thomas Rast | 2010-10-19 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-10-19 | 5 | -25/+49 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To' | Antonio Ospite | 2010-10-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Clarify and extend the "git diff" format documentation | Andreas Gruenbacher | 2010-10-19 | 1 | -10/+30 | |
| * | | | | | | | | | | | | | git-show-ref.txt: clarify the pattern matching | Michael J Gruber | 2010-10-19 | 1 | -1/+5 | |
| * | | | | | | | | | | | | | documentation: git-config minor cleanups | Cliff Frey | 2010-10-19 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | Update test script annotate-tests.sh to handle missing/extra authors | Kevin Ballard | 2010-10-19 | 1 | -6/+6 | |
* | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-10-14 | 25 | -68/+79 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Better advice on using topic branches for kernel development | Luck, Tony | 2010-10-14 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | Documentation: update implicit "--no-index" behavior in "git diff" | Jonathan Nieder | 2010-10-14 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | Documentation: expand 'git diff' SEE ALSO section | Jonathan Nieder | 2010-10-14 | 1 | -2/+6 | |
| * | | | | | | | | | | | | | Documentation: diff can compare blobs | Jonathan Nieder | 2010-10-14 | 1 | -2/+3 | |
| * | | | | | | | | | | | | | Documentation: gitrevisions is in section 7 | Jonathan Nieder | 2010-10-14 | 16 | -20/+20 |