diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:31:47 -0400 |
| commit | d55e7c3acf72413563e695a19f7f66efac442064 (patch) | |
| tree | b12d163ceb3e56e36a90c82b9c075a3401cd00d3 /Makefile | |
| parent | 03618b9df84a0e94e36fdb27060e605e85b956e9 (diff) | |
| parent | 8492f00b4f28471af84d3887096257822c4d2bc9 (diff) | |
| download | git-d55e7c3acf72413563e695a19f7f66efac442064.tar.gz git-d55e7c3acf72413563e695a19f7f66efac442064.tar.xz | |
Merge branch 'maint'
* maint:
Whip post 1.5.3.4 maintenance series into shape.
rebase -i: use diff plumbing instead of porcelain
Do not remove distributed configure script
git-archive: document --exec
git-reflog: document --verbose
git-config: handle --file option with relative pathname properly
clear_commit_marks(): avoid deep recursion
git add -i: Remove unused variables
git add -i: Fix parsing of abbreviated hunk headers
git-config: don't silently ignore options after --list
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
Fix embarrassing "git log --follow" bug
Conflicts:
RelNotes
git-rebase--interactive.sh
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1092,6 +1092,9 @@ dist-doc: ### Cleaning rules +distclean: clean + $(RM) configure + clean: $(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \ $(LIB_FILE) $(XDIFF_LIB) @@ -1099,7 +1102,7 @@ clean: $(RM) $(TEST_PROGRAMS) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope* $(RM) -r autom4te.cache - $(RM) configure config.log config.mak.autogen config.mak.append config.status config.cache + $(RM) config.log config.mak.autogen config.mak.append config.status config.cache $(RM) -r $(GIT_TARNAME) .doc-tmp-dir $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz $(RM) $(htmldocs).tar.gz $(manpages).tar.gz |