summaryrefslogtreecommitdiffstats
path: root/notes-merge.h (unfollow)
Commit message (Expand)AuthorFilesLines
2015-01-07git-checkout.txt: a note about multiple checkout support for submodulesNguyễn Thái Ngọc Duy1-0/+3
2015-01-07checkout: add --ignore-other-wortreesNguyễn Thái Ngọc Duy3-1/+18
2015-01-07checkout: pass whole struct to parse_branchname_arg instead of individual flagsNguyễn Thái Ngọc Duy1-7/+6
2014-12-01git-common-dir: make "modules/" per-working-directory directoryMax Kirillov3-4/+52
2014-12-01checkout: do not fail if target is an empty directoryMax Kirillov2-2/+7
2014-12-01t2025: add a test to make sure grafts is working from a linked checkoutNguyễn Thái Ngọc Duy1-0/+18
2014-12-01checkout: don't require a work tree when checking out into a new oneDennis Kaarsemaker3-1/+19
2014-12-01git_path(): keep "info/sparse-checkout" per work-treeNguyễn Thái Ngọc Duy2-1/+3
2014-12-01count-objects: report unused files in $GIT_DIR/worktrees/...Nguyễn Thái Ngọc Duy3-3/+31
2014-12-01gc: support prune --worktreesNguyễn Thái Ngọc Duy3-4/+24
2014-12-01gc: factor out gc.pruneexpire parsing codeNguyễn Thái Ngọc Duy1-10/+12
2014-12-01gc: style change -- no SP before closing parenthesisNguyễn Thái Ngọc Duy1-1/+1
2014-12-01checkout: clean up half-prepared directories in --to modeNguyễn Thái Ngọc Duy2-0/+54
2014-12-01checkout: reject if the branch is already checked out elsewhereNguyễn Thái Ngọc Duy2-7/+104
2014-12-01prune: strategies for linked checkoutsNguyễn Thái Ngọc Duy7-2/+251
2014-12-01checkout: support checking out into a new working directoryNguyễn Thái Ngọc Duy6-4/+212
2014-12-01use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy5-31/+8
2014-12-01wrapper.c: wrapper to open a file, fprintf then closeNguyễn Thái Ngọc Duy2-0/+33
2014-12-01setup.c: support multi-checkout repo setupNguyễn Thái Ngọc Duy9-14/+115
2014-12-01setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()Nguyễn Thái Ngọc Duy1-2/+4
2014-12-01setup.c: convert check_repository_format_gently to use strbufNguyễn Thái Ngọc Duy1-4/+8
2014-12-01setup.c: detect $GIT_COMMON_DIR in is_git_directory()Nguyễn Thái Ngọc Duy2-6/+44
2014-12-01setup.c: convert is_git_directory() to use strbufNguyễn Thái Ngọc Duy1-16/+21
2014-12-01git-stash: avoid hardcoding $GIT_DIR/logs/....Nguyễn Thái Ngọc Duy1-2/+2
2014-12-01*.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy6-24/+22
2014-12-01git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objectsNguyễn Thái Ngọc Duy1-1/+1
2014-12-01$GIT_COMMON_DIR: a new environment variableNguyễn Thái Ngọc Duy6-19/+117
2014-12-01commit: use SEQ_DIR instead of hardcoding "sequencer"Nguyễn Thái Ngọc Duy1-1/+1
2014-12-01fast-import: use git_path() for accessing .git dir instead of get_git_dir()Nguyễn Thái Ngọc Duy1-4/+1
2014-12-01reflog: avoid constructing .lock path with git_pathNguyễn Thái Ngọc Duy1-1/+1
2014-12-01*.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy2-2/+2
2014-12-01git_path(): be aware of file relocation in $GIT_DIRNguyễn Thái Ngọc Duy6-7/+95
2014-12-01path.c: group git_path(), git_pathdup() and strbuf_git_path() togetherNguyễn Thái Ngọc Duy1-10/+10
2014-12-01path.c: rename vsnpath() to do_git_path()Nguyễn Thái Ngọc Duy1-4/+4
2014-12-01git_snpath(): retire and replace with strbuf_git_path()Nguyễn Thái Ngọc Duy5-26/+55
2014-12-01path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy15-32/+36
2014-12-01path.c: make get_pathname() return strbuf instead of static bufferNguyễn Thái Ngọc Duy1-69/+51
2014-11-26Git 2.2v2.2.0Junio C Hamano2-1/+6
2014-11-26RelNotes: spelling & grammar tweaksMarc Branchaud1-51/+52
2014-11-21Git 2.2.0-rc3v2.2.0-rc3Junio C Hamano2-14/+15
2014-11-20l10n: remove a superfluous translation for push.cJiang Xin6-30/+6
2014-11-20l10n: de.po: translate 2 messagesRalf Thielow1-3/+1
2014-11-20l10n: de.po: translate 2 new messagesRalf Thielow1-2/+2
2014-11-20l10n: batch updates for one trivial changeJiang Xin7-519/+554
2014-11-20l10n: git.pot: v2.2.0 round 2 (1 updated)Jiang Xin1-24/+24
2014-11-18l10n: Update Catalan translationAlex Henrie1-2165/+2392
2014-11-15l10n: de.po: translate 62 new messagesRalf Thielow1-1414/+1663
2014-11-15l10n: de.po: Fixup one translationStefan Beller1-4/+4
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2-0/+6
2014-11-14Git 2.2.0-rc2v2.2.0-rc2Junio C Hamano1-1/+1