Merge branch 'maint'

* maint:
  Documentation/git-reset.txt: suggest git commit --amend in example.
  Build RPM with ETC_GITCONFIG=/etc/gitconfig
  Ignore all man sections as they are generated files.
  Fix typo in git-am: s/Was is/Was it/
  Reverse the order of -b and --track in the man page.
  dir.c(common_prefix): Fix two bugs

Conflicts:

	git.spec.in

diff --cc dir.c
Simple merge

diff --cc git.spec.in
index f0746ed78c79739885ca9c32af27d3ee9ed4a974,87197d10e19107883716e3ced5b4eb38c3d933be..556bdda7aa2ec7a99c7668390c60cdc69eed74f5
--- 1/git.spec.in
--- 2/git.spec.in
+++ b/git.spec.in
@@@ -95,15 -85,17 +95,17 @@@ Perl interface to Gi
  %setup -q
  
  %build
 -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
 +make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_P4IMPORT=YesPlease \
+      ETC_GITCONFIG=/etc/gitconfig \
 -     prefix=%{_prefix} all %{!?_without_docs: doc}
 +     prefix=%{_prefix} PYTHON_PATH=%{python_path} all %{!?_without_docs: doc}
  
  %install
  rm -rf $RPM_BUILD_ROOT
  make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
 -     WITH_OWN_SUBPROCESS_PY=YesPlease \
 +     WITH_P4IMPORT=YesPlease prefix=%{_prefix} mandir=%{_mandir} \
+      ETC_GITCONFIG=/etc/gitconfig \
 -     prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
 -     install %{!?_without_docs: install-doc}
 +     PYTHON_PATH=%{python_path} \
 +     INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
  find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
  find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
  find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'