summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees2013-04-155-22/+41
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't scan the work tree three timesKarsten Blees2013-04-151-74/+72
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-status: avoid is_excluded checks for tracked filesKarsten Blees2013-04-151-27/+11
| * | | | | | | | | | | | | | | | | | | | | dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees2013-04-157-116/+16
| * | | | | | | | | | | | | | | | | | | | | dir.c: unify is_excluded and is_path_excluded APIsKarsten Blees2013-04-152-67/+46
| * | | | | | | | | | | | | | | | | | | | | dir.c: move prep_excludeKarsten Blees2013-04-151-72/+72
| * | | | | | | | | | | | | | | | | | | | | dir.c: factor out parts of last_exclude_matching for later reuseKarsten Blees2013-04-151-14/+22
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-clean -d -X: don't delete tracked directoriesKarsten Blees2013-04-154-11/+66
| * | | | | | | | | | | | | | | | | | | | | dir.c: make 'git-status --ignored' work within leading directoriesKarsten Blees2013-04-152-0/+22
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't list empty directories as ignoredKarsten Blees2013-04-152-4/+27
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-ls-files --directories: don't hide empty directoriesKarsten Blees2013-04-153-5/+26
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't list empty ignored directoriesKarsten Blees2013-04-152-7/+28
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't list files in ignored directoriesKarsten Blees2013-04-152-3/+28
| * | | | | | | | | | | | | | | | | | | | | dir.c: git-status --ignored: don't drop ignored directoriesKarsten Blees2013-04-152-0/+36
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-install-doc'Junio C Hamano2013-04-232-8/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibilityJonathan Nieder2013-04-171-0/+7
| * | | | | | | | | | | | | | | | | | | | gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEMJakub Narębski2013-04-151-8/+5
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/untracked-zsh-prompt'Junio C Hamano2013-04-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | prompt: fix untracked files for zshFelipe Contreras2013-04-211-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure'Junio C Hamano2013-04-231-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | receive-pack: close sideband fd on early pack errorsJeff King2013-04-191-1/+4
* | | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2013-04-221-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Start preparing for 1.8.2.2Junio C Hamano2013-04-222-1/+26
| * | | | | | | | | | | | | | | | | | Merge branch 'ta/glossary' into maintJunio C Hamano2013-04-2232-111/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/doc-http-backend' into maintJunio C Hamano2013-04-223-1/+129
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-trash' into maintJunio C Hamano2013-04-221-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-user-doc' into maintJunio C Hamano2013-04-221-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/detached-head-doc' into maintJunio C Hamano2013-04-221-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano2013-04-221-9/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/rerere-forget-protect-against-NUL' into maintJunio C Hamano2013-04-222-10/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano2013-04-224-7/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/combine-diff-ignore-whitespace' into maintJunio C Hamano2013-04-222-7/+161
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/suppress-clang-warning' into maintJunio C Hamano2013-04-222-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/perl-keep-stderr-open' into maintJunio C Hamano2013-04-222-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/bundle-with-tip-wo-message' into maintJunio C Hamano2013-04-222-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-come-back-to-original' into maintJunio C Hamano2013-04-222-2/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/prompt-revert-head' into maintJunio C Hamano2013-04-221-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-221-0/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano2013-04-222-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: Allow repo using gitfile as a referenceAaron Schrab2013-04-092-2/+25
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: Fix error message for reference repositoryAaron Schrab2013-04-081-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/add-2.0-delete-default' (early part)Junio C Hamano2013-04-223-32/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git add: rephrase the "removal will cease to be ignored" warningJunio C Hamano2013-04-211-7/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git add: rework the logic to warn "git add <pathspec>..." default changeJunio C Hamano2013-04-171-26/+38
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git add: start preparing for "git add <pathspec>..." to default to "-A"Junio C Hamano2013-03-083-6/+59
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin/add.c: simplify boolean variablesJunio C Hamano2013-03-081-11/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-keep-sparse'Junio C Hamano2013-04-225-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: add --ignore-skip-worktree-bits in sparse checkout modeNguyễn Thái Ngọc Duy2013-04-155-1/+40
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/chopped-ident'Junio C Hamano2013-04-225-99/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blame: handle broken commit headers gracefullyRené Scharfe2013-04-171-3/+8