Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'pt/enter-repo-comment-fix' into maint | Junio C Hamano | 2015-04-21 | 1 | -8/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | enter_repo(): fix docs to match codept/enter-repo-comment-fix | Paul Tan | 2015-03-31 | 1 | -8/+3 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'jz/gitweb-conf-doc-fix' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | gitweb.conf.txt: say "build-time", not "built-time"jz/gitweb-conf-doc-fix | Jérôme Zago | 2015-03-31 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'jk/cherry-pick-docfix' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | cherry-pick: fix docs describing handling of empty commitsjk/cherry-pick-docfix | Jeff King | 2015-03-30 | 1 | -1/+2 | |
* | | | | | | | | | | Merge branch 'iu/fix-parse-options-h-comment' into maint | Junio C Hamano | 2015-04-21 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defvaliu/fix-parse-options-h-comment | Ivan Ukhov | 2015-03-29 | 1 | -2/+1 | |
* | | | | | | | | | | | Merge branch 'jg/cguide-we-cannot-count' into maint | Junio C Hamano | 2015-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | CodingGuidelines: update 'rough' rule countjg/cguide-we-cannot-count | Julian Gindi | 2015-04-14 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jk/pack-corruption-post-mortem' into maint | Junio C Hamano | 2015-04-21 | 1 | -0/+237 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | howto: document more tools for recovery corruptionjk/pack-corruption-post-mortem | Jeff King | 2015-04-01 | 1 | -0/+237 | |
* | | | | | | | | | | | | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint | Junio C Hamano | 2015-04-21 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | fast-import doc: remove suggested 16-parent limitjn/doc-fast-import-no-16-octopus-limit | Jonathan Nieder | 2015-03-31 | 1 | -4/+0 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Git 2.3.5v2.3.5 | Junio C Hamano | 2015-03-31 | 3 | -2/+6 | |
* | | | | | | | | | | | Merge branch 'ss/pull-rebase-preserve' into maint | Junio C Hamano | 2015-03-31 | 2 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | docs: clarify what git-rebase's "-p" / "--preserve-merges" doesss/pull-rebase-preserve | Sebastian Schuberth | 2015-03-30 | 1 | -1/+3 | |
| * | | | | | | | | | | | docs: clarify "preserve" option wording for git-pull | Sebastian Schuberth | 2015-03-26 | 1 | -3/+2 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'jc/report-path-error-to-dir' into maint | Junio C Hamano | 2015-03-31 | 4 | -44/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | report_path_error(): move to dir.cjc/report-path-error-to-dir | Junio C Hamano | 2015-03-24 | 4 | -44/+44 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'ph/push-doc-cas' into maint | Junio C Hamano | 2015-03-31 | 1 | -8/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | git-push.txt: clean up force-with-lease wordingph/push-doc-cas | Phil Hord | 2015-03-26 | 1 | -8/+6 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Prepare for 2.3.5 | Junio C Hamano | 2015-03-28 | 2 | -1/+42 | |
* | | | | | | | | | | | Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint | Junio C Hamano | 2015-03-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | completion: use __gitcomp_nl() for completing refssg/completion-gitcomp-nl-for-refs | SZEDER Gábor | 2015-03-22 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint | Junio C Hamano | 2015-03-28 | 1 | -7/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | sha1fd_check: die when we cannot open the filejk/simplify-csum-file-sha1fd-check | Jeff King | 2015-03-19 | 1 | -7/+3 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'tg/test-index-v4' into maint | Junio C Hamano | 2015-03-28 | 1 | -3/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | t1700: make test pass with index-v4tg/test-index-v4 | Thomas Gummerer | 2015-03-20 | 1 | -3/+12 | |
* | | | | | | | | | | | | | Merge branch 'nd/doc-git-index-version' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git.txt: list index versions in plain Englishnd/doc-git-index-version | Nguyễn Thái Ngọc Duy | 2015-03-24 | 1 | -1/+2 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ct/prompt-untracked-fix' into maint | Junio C Hamano | 2015-03-28 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fix | Cody A Taylor | 2015-03-15 | 2 | -1/+12 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'ws/grep-quiet-no-pager' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | grep: fix "--quiet" overwriting current outputws/grep-quiet-no-pager | Wilhelm Schuermann | 2015-03-19 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'jc/submitting-patches-mention-send-email' into maint | Junio C Hamano | 2015-03-28 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | SubmittingPatches: encourage users to use format-patch and send-emailjc/submitting-patches-mention-send-email | Junio C Hamano | 2015-03-15 | 1 | -0/+5 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/cleanup-failed-clone' into maint | Junio C Hamano | 2015-03-28 | 1 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | clone: drop period from end of die_errno messagejk/cleanup-failed-clone | Jeff King | 2015-03-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | clone: initialize atexit cleanup handler earlier | Jeff King | 2015-03-19 | 1 | -4/+5 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'jk/fetch-pack' into maint | Junio C Hamano | 2015-03-28 | 3 | -13/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | fetch-pack: remove dead assignment to ref->new_sha1jk/fetch-pack | Jeff King | 2015-03-19 | 1 | -3/+0 | |
| * | | | | | | | | | | | | | fetch_refs_via_pack: free extra copy of refs | Jeff King | 2015-03-19 | 1 | -3/+5 | |
| * | | | | | | | | | | | | | filter_ref: make a copy of extra "sought" entries | Jeff King | 2015-03-19 | 2 | -6/+12 | |
| * | | | | | | | | | | | | | filter_ref: avoid overwriting ref->old_sha1 with garbage | Jeff King | 2015-03-19 | 1 | -1/+5 | |
* | | | | | | | | | | | | | | Merge branch 'tg/fix-check-order-with-split-index' into maint | Junio C Hamano | 2015-03-28 | 1 | -19/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | read-cache: fix reading of split indextg/fix-check-order-with-split-index | Thomas Gummerer | 2015-03-20 | 1 | -19/+23 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 | 7 | -68/+147 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | refs.c: drop curate_packed_refsjk/prune-with-corrupt-refs | Jeff King | 2015-03-20 | 2 | -67/+2 | |
| * | | | | | | | | | | | | | | repack: turn on "ref paranoia" when doing a destructive repack | Jeff King | 2015-03-20 | 2 | -3/+7 |