Merge branch 'master' of https://github.com/prati0100/git-gui

Junio C Hamano committed almost 7 years ago

sha1_name: simplify strbuf handling in interpret_nth_prior_checkout()

René Scharfe committed almost 7 years ago

doc: fix reference to --ignore-submodules

Alex Henrie committed almost 7 years ago

contrib/svn-fe: fix shebang for svnrdump_sim.py

Clément Chigot committed almost 7 years ago

Merge gitk to pick up emergency build fix

Junio C Hamano committed almost 7 years ago

gitk: rename zh_CN.po to zh_cn.po

Denton Liu committed almost 7 years ago

Makefile: run coccicheck on more source files

Denton Liu committed almost 7 years ago

Makefile: strip leading ./ in $(FIND_SOURCE_FILES)

Denton Liu committed almost 7 years ago

Makefile: define THIRD_PARTY_SOURCES

Denton Liu committed almost 7 years ago

clean: fix theoretical path corruption

Elijah Newren committed almost 7 years ago

clean: rewrap overly long line

Elijah Newren committed almost 7 years ago

clean: avoid removing untracked files in a nested git repository

Elijah Newren committed almost 7 years ago

clean: disambiguate the definition of -d

Elijah Newren committed almost 7 years ago

git-clean.txt: do not claim we will delete files with -n/--dry-run

Elijah Newren committed almost 7 years ago

dir: add commentary explaining match_pathspec_item's return value

Elijah Newren committed almost 7 years ago

dir: if our pathspec might match files under a dir, recurse into it

Elijah Newren committed almost 7 years ago

dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case

Elijah Newren committed almost 7 years ago

dir: also check directories for matching pathspecs

Elijah Newren committed almost 7 years ago

dir: fix off-by-one error in match_pathspec_item

Elijah Newren committed almost 7 years ago

dir: fix typo in comment

Elijah Newren committed almost 7 years ago