Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gb/maint-submodule-env' into maint | Junio C Hamano | 2010-03-08 | 8 | -33/+69 |
|\ | |||||
| * | is_submodule_modified(): clear environment properly | Giuseppe Bilotta | 2010-02-25 | 1 | -11/+11 |
| * | submodules: ensure clean environment when operating in a submodule | Giuseppe Bilotta | 2010-02-25 | 1 | -10/+10 |
| * | shell setup: clear_local_git_env() function | Giuseppe Bilotta | 2010-02-25 | 1 | -0/+7 |
| * | rev-parse: --local-env-vars option | Giuseppe Bilotta | 2010-02-25 | 2 | -0/+13 |
| * | Refactor list of of repo-local env vars | Giuseppe Bilotta | 2010-02-25 | 3 | -12/+28 |
* | | Merge branch 'as/maint-expire' into maint | Junio C Hamano | 2010-03-08 | 4 | -18/+86 |
|\ \ | |||||
| * | | reflog: honor gc.reflogexpire=never | Adam Simpkins | 2010-02-28 | 2 | -4/+43 |
| * | | prune: honor --expire=never | Adam Simpkins | 2010-02-28 | 2 | -14/+43 |
* | | | Merge branch 'ml/maint-grep-doc' into maint | Junio C Hamano | 2010-03-08 | 1 | -13/+17 |
|\ \ \ | |||||
| * | | | grep docs: document --no-index option | Mark Lodato | 2010-02-26 | 1 | -4/+8 |
| * | | | grep docs: --cached and <tree>... are incompatible | Mark Lodato | 2010-02-26 | 1 | -3/+3 |
| * | | | grep docs: use AsciiDoc literals consistently | Mark Lodato | 2010-02-26 | 1 | -5/+5 |
| * | | | grep docs: pluralize "Example" section | Mark Lodato | 2010-02-26 | 1 | -2/+2 |
* | | | | Merge branch 'jk/maint-push-tracking-wo-remote' into maint | Junio C Hamano | 2010-03-08 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | push: fix segfault for odd config | Jeff King | 2010-02-24 | 1 | -1/+1 |
* | | | | | Merge branch 'jc/fetch-param' into maint | Junio C Hamano | 2010-03-08 | 2 | -33/+88 |
|\ \ \ \ \ | |||||
| * | | | | | fetch --all/--multiple: keep all the fetched branch information | Junio C Hamano | 2010-02-24 | 2 | -7/+40 |
| * | | | | | builtin-fetch --all/--multi: propagate options correctly | Junio C Hamano | 2010-02-24 | 2 | -1/+29 |
| * | | | | | t5521: fix and modernize | Junio C Hamano | 2010-02-24 | 1 | -26/+20 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'ne/pack-local-doc' into maint | Junio C Hamano | 2010-03-08 | 1 | -8/+7 |
|\ \ \ \ \ | |||||
| * | | | | | pack-objects documentation: Fix --honor-pack-keep as well. | Nelson Elhage | 2010-02-25 | 1 | -2/+2 |
| * | | | | | pack-objects documentation: reword "objects that appear in the standard input" | Junio C Hamano | 2010-02-25 | 1 | -3/+3 |
| * | | | | | Documentation: pack-objects: Clarify --local's semantics. | Nelson Elhage | 2010-02-20 | 1 | -5/+4 |
* | | | | | | Merge branch 'jk/maint-add--interactive-delete' into maint | Junio C Hamano | 2010-03-08 | 2 | -1/+31 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add-interactive: fix bogus diff header line ordering | Jeff King | 2010-02-23 | 2 | -1/+31 |
* | | | | | | | Merge branch 'mm/mkstemps-mode-for-packfiles' into maint | Junio C Hamano | 2010-03-08 | 8 | -93/+172 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use git_mkstemp_mode instead of plain mkstemp to create object files | Matthieu Moy | 2010-02-23 | 2 | -4/+4 |
| * | | | | | | | git_mkstemps_mode: don't set errno to EINVAL on exit. | Matthieu Moy | 2010-02-23 | 1 | -1/+0 |
| * | | | | | | | Use git_mkstemp_mode and xmkstemp_mode in odb_mkstemp, not chmod later. | Matthieu Moy | 2010-02-23 | 3 | -20/+10 |
| * | | | | | | | git_mkstemp_mode, xmkstemp_mode: variants of gitmkstemps with mode argument. | Matthieu Moy | 2010-02-23 | 3 | -2/+27 |
| * | | | | | | | Move gitmkstemps to path.c | Matthieu Moy | 2010-02-23 | 3 | -71/+69 |
| * | | | | | | | Add a testcase for ACL with restrictive umask. | Matthieu Moy | 2010-02-23 | 1 | -0/+67 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/maint-fix-mailinfo-strip' into maint | Junio C Hamano | 2010-03-08 | 2 | -3/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mailinfo: do not strip leading spaces even for a header line | Junio C Hamano | 2010-02-20 | 2 | -3/+2 |
* | | | | | | | | Merge branch 'jc/grep-author-all-match-implicit' into maint | Junio C Hamano | 2010-03-08 | 6 | -10/+57 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | "log --author=me --grep=it" should find intersection, not union | Junio C Hamano | 2010-01-26 | 6 | -10/+57 |
* | | | | | | | | | Merge branch 'jc/checkout-detached' into maint | Junio C Hamano | 2010-03-08 | 5 | -12/+46 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Reword "detached HEAD" notification | Junio C Hamano | 2010-01-30 | 5 | -12/+46 |
* | | | | | | | | | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-03-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 2 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/maint-push-sideband' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 10 | -133/+371 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 1 | -1/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/optim-text-wrap' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 3 | -37/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/maint-bisect-paths' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 2 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | Git 1.7.0.2v1.7.0.2 | Junio C Hamano | 2010-03-07 | 3 | -8/+3 |
* | | | | | | | | | | | | | | | | | | | unset GREP_OPTIONS in test-lib.sh | Bert Wesarg | 2010-03-07 | 1 | -0/+2 |