Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: submodule.* config are keyed by submodule nameswt/doc-submodule-name-path-confusion-1 | W. Trevor King | 2014-03-27 | 1 | -1/+1 |
* | submodule add: If --branch is given, record it in .gitmodules | W. Trevor King | 2012-12-19 | 3 | -0/+7 |
* | submodule update: add --remote for submodule's upstream changes | W. Trevor King | 2012-12-19 | 5 | -2/+84 |
* | submodule: add get_submodule_config helper funtion | W. Trevor King | 2012-12-11 | 1 | -0/+26 |
* | Merge branch 'maint' | Junio C Hamano | 2012-11-27 | 1 | -1/+2 |
|\ | |||||
| * | Merge branch 'nd/maint-compat-fnmatch-fix' into maint | Junio C Hamano | 2012-11-27 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'jh/update-ref-d-through-symref' into maint | Junio C Hamano | 2012-11-27 | 2 | -1/+19 |
| |\ \ | |||||
| * \ \ | Merge branch 'esr/maint-doc-fast-import' into maint | Junio C Hamano | 2012-11-27 | 1 | -2/+6 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'wtk/submodule-doc-fixup' into maint | Junio C Hamano | 2012-11-27 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| * | | | | | Documentation: improve phrasing in git-push.txt | Mark Szepieniec | 2012-11-27 | 1 | -1/+2 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-11-26 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix typo in remote set-head usage | Antoine Pelisse | 2012-11-26 | 1 | -1/+1 |
| * | | | | | Makefile: hide stderr of curl-config test | Paul Gortmaker | 2012-11-26 | 1 | -1/+1 |
* | | | | | | emacs: make 'git-status' work with separate git dirs | Enrico Scholz | 2012-11-26 | 1 | -1/+1 |
* | | | | | | Update draft release notes to 1.8.1 | Junio C Hamano | 2012-11-25 | 1 | -0/+14 |
* | | | | | | Merge branch 'rr/submodule-diff-config' | Junio C Hamano | 2012-11-25 | 7 | -24/+98 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule: display summary header in bold | Ramkumar Ramachandra | 2012-11-18 | 3 | -6/+6 |
| * | | | | | | diff: rename "set" variable | Jeff King | 2012-11-18 | 2 | -6/+21 |
| * | | | | | | diff: introduce diff.submodule configuration variable | Ramkumar Ramachandra | 2012-11-18 | 4 | -6/+65 |
| * | | | | | | Documentation: move diff.wordRegex from config.txt to diff-config.txt | Ramkumar Ramachandra | 2012-11-18 | 2 | -6/+6 |
* | | | | | | | Merge branch 'nd/maint-compat-fnmatch-fix' | Junio C Hamano | 2012-11-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | compat/fnmatch: fix off-by-one character class's length check | Nguyễn Thái Ngọc Duy | 2012-11-20 | 1 | -1/+1 |
* | | | | | | | Merge branch 'bc/do-not-recurse-in-die' | Junio C Hamano | 2012-11-25 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | usage.c: detect recursion in die routines and bail out immediately | Brandon Casey | 2012-11-15 | 1 | -0/+15 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mk/complete-tcsh' | Junio C Hamano | 2012-11-25 | 1 | -0/+63 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tcsh-completion re-using git-completion.bash | Marc Khouzam | 2012-11-16 | 1 | -0/+63 |
* | | | | | | | | Merge branch 'jh/update-ref-d-through-symref' | Junio C Hamano | 2012-11-25 | 2 | -1/+19 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Fix failure to delete a packed ref through a symref | Johan Herland | 2012-10-21 | 2 | -2/+2 |
| * | | | | | | | t1400-update-ref: Add test verifying bug with symrefs in delete_ref() | Johan Herland | 2012-10-21 | 1 | -0/+18 |
* | | | | | | | | Merge branch 'lt/diff-stat-show-0-lines' | Junio C Hamano | 2012-11-25 | 4 | -36/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix "git diff --stat" for interesting - but empty - file changes | Linus Torvalds | 2012-10-17 | 4 | -36/+42 |
* | | | | | | | | | Merge branch 'sg/complete-help-undup' | Junio C Hamano | 2012-11-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | completion: remove 'help' duplicate from porcelain commands | SZEDER Gábor | 2012-11-14 | 1 | -1/+1 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Sync with 1.8.0.1 | Junio C Hamano | 2012-11-25 | 4 | -4/+17 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Git 1.8.0.1v1.8.0.1 | Junio C Hamano | 2012-11-25 | 3 | -3/+16 |
| * | | | | | | | | Merge branch 'jk/checkout-out-of-unborn' into maint | Junio C Hamano | 2012-11-25 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'cn/config-missing-path' into maint | Junio C Hamano | 2012-11-25 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-gitweb-xss' into maint | Junio C Hamano | 2012-11-25 | 2 | -0/+16 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Completion must sort before using uniq | Marc Khouzam | 2012-11-24 | 1 | -1/+1 |
* | | | | | | | | | | | | Update draft release notes for 1.8.1 | Junio C Hamano | 2012-11-21 | 1 | -0/+10 |
* | | | | | | | | | | | | Merge branch 'esr/maint-doc-fast-import' | Junio C Hamano | 2012-11-21 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | doc/fast-import: clarify how content states are built | Eric S. Raymond | 2012-11-08 | 1 | -2/+6 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'wtk/submodule-doc-fixup' | Junio C Hamano | 2012-11-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | git-submodule: wrap branch option with "<>" in usage strings. | W. Trevor King | 2012-10-25 | 2 | -2/+2 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'so/prompt-command' | Junio C Hamano | 2012-11-21 | 1 | -8/+90 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | coloured git-prompt: paint detached HEAD marker in red | Junio C Hamano | 2012-10-17 | 1 | -1/+1 |
| * | | | | | | | | | | Fix up colored git-prompt | Simon Oosthoek | 2012-10-16 | 1 | -23/+32 |
| * | | | | | | | | | | show color hints based on state of the git tree | Simon Oosthoek | 2012-10-11 | 1 | -1/+35 |
| * | | | | | | | | | | Allow __git_ps1 to be used in PROMPT_COMMAND | Simon Oosthoek | 2012-10-11 | 1 | -6/+45 |
* | | | | | | | | | | | Merge branch 'jk/config-ignore-duplicates' | Junio C Hamano | 2012-11-21 | 4 | -196/+232 |
|\ \ \ \ \ \ \ \ \ \ \ |