aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-03
|\
| * mingw: activate allocaKirill Smelkov2014-04-09
| * combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov2014-04-07
| * tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-07
| * Portable alloca for GitKirill Smelkov2014-03-27
| * tree-diff: reuse base str(buf) memory on sub-tree recursionKirill Smelkov2014-03-27
| * tree-diff: no need to call "full" diff_tree_sha1 from show_path()Kirill Smelkov2014-03-27
| * tree-diff: rework diff_tree interface to be sha1 basedKirill Smelkov2014-03-27
| * tree-diff: diff_tree() should now be staticKirill Smelkov2014-03-26
| * tree-diff: remove special-case diff-emitting code for empty-tree casesKirill Smelkov2014-03-26
| * tree-diff: simplify tree_entry_pathcmpKirill Smelkov2014-03-20
| * tree-diff: show_path prototype is not needed anymoreKirill Smelkov2014-03-20
| * tree-diff: rename compare_tree_entry -> tree_entry_pathcmpKirill Smelkov2014-03-20
| * tree-diff: move all action-taking code out of compare_tree_entry()Kirill Smelkov2014-03-20
| * tree-diff: don't assume compare_tree_entry() returns -1,0,1Kirill Smelkov2014-03-20
| * tree-diff: consolidate code for emitting diffs and recursion in one placeKirill Smelkov2014-03-20
| * tree-diff: show_tree() is not neededKirill Smelkov2014-03-04
| * tree-diff: no need to pass match to skip_uninteresting()Kirill Smelkov2014-02-24
| * tree-diff: no need to manually verify that there is no mode change for a pathKirill Smelkov2014-02-24
| * combine-diff: move changed-paths scanning logic into its own functionKirill Smelkov2014-02-24
| * combine-diff: move show_log_first logic/action out of paths scanningKirill Smelkov2014-02-24
* | Merge branch 'jc/apply-ignore-whitespace'Junio C Hamano2014-06-03
|\ \
| * | apply --ignore-space-change: lines with and without leading whitespaces do no...Junio C Hamano2014-03-26
* | | Merge branch 'as/grep-fullname-config'Junio C Hamano2014-06-03
|\ \ \
| * | | grep: add grep.fullName config variableAndreas Schwab2014-03-20
* | | | Sync with 1.9.4Junio C Hamano2014-05-30
|\ \ \ \
| * | | | Git 1.9.4v1.9.4Junio C Hamano2014-05-30
| * | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-28
| |\ \ \ \
| * \ \ \ \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-28
| |\ \ \ \ \
* | | | | | | t5537: re-drop http testsJeff King2014-05-30
* | | | | | | Git 2.0v2.0.0Junio C Hamano2014-05-28
* | | | | | | Update draft release notes to 2.0Junio C Hamano2014-05-21
* | | | | | | Git 2.0-rc4v2.0.0-rc4Junio C Hamano2014-05-20
* | | | | | | RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, do...Jason St. John2014-05-20
* | | | | | | Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"Junio C Hamano2014-05-20
* | | | | | | Merge branch 'jc/graduate-remote-hg-bzr' (early part)Junio C Hamano2014-05-19
|\ \ \ \ \ \ \
| * | | | | | | remote-helpers: point at their upstream repositoriesJunio C Hamano2014-05-19
| * | | | | | | contrib: remote-helpers: add move warnings (v2.0)Felipe Contreras2014-05-19
| * | | | | | | Revert "Merge branch 'fc/transport-helper-sync-error-fix'"Junio C Hamano2014-05-19
* | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'Junio C Hamano2014-05-19
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | git-prompt.sh: don't assume the shell expands the value of PS1Richard Hansen2014-05-19
* | | | | | | | Merge branch 'lt/request-pull'Junio C Hamano2014-05-19
|\ \ \ \ \ \ \ \
| * | | | | | | | request-pull: resurrect for-linus -> tags/for-linus DWIMJunio C Hamano2014-05-16
* | | | | | | | | Merge branch 'jl/use-vsatisfy-correctly-for-2.0'Junio C Hamano2014-05-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-gui: tolerate major version changes when comparing the git versionJens Lehmann2014-05-19
* | | | | | | | | | Merge git://github.com/git-l10n/git-poJunio C Hamano2014-05-19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fr: a lot of good fixupsGrégoire Paris2014-05-17
* | | | | | | | | | | Merge branch 'kb/fast-hashmap'Junio C Hamano2014-05-19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Documentation/technical/api-hashmap: remove source highlightingAnders Kaseorg2014-05-19
* | | | | | | | | | | Merge branch 'fc/prompt-zsh-read-from-file'Junio C Hamano2014-05-13
|\ \ \ \ \ \ \ \ \ \ \