git, branch v1.7.7-rc0

Git 1.7.7-rc0

2011-08-26T04:00:46Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/merge-reword'

2011-08-25T23:00:53Z

* jc/merge-reword: merge: reword the final message

Merge branch 'mg/branch-set-upstream-previous'

2011-08-25T23:00:49Z

* mg/branch-set-upstream-previous: branch.c: use the parsed branch name

Merge branch 'da/difftool-mergtool-refactor'

2011-08-25T23:00:43Z

* da/difftool-mergtool-refactor: mergetools/meld: Use '--output' when available mergetool--lib: Refactor tools into separate files mergetool--lib: Make style consistent with git difftool--helper: Make style consistent with git

Merge branch 'jc/maint-autofix-tag-in-head'

2011-08-25T23:00:37Z

* jc/maint-autofix-tag-in-head: commit: reduce use of redundant global variables

Merge branch 'di/fast-import-doc'

2011-08-25T23:00:32Z

* di/fast-import-doc: doc/fast-import: document feature import-marks-if-exists

Merge branch 'jn/plug-empty-tree-leak'

2011-08-25T23:00:29Z

* jn/plug-empty-tree-leak: merge-recursive: take advantage of hardcoded empty tree revert: plug memory leak in "cherry-pick root commit" codepath

Merge branch 'ac/describe-dirty-refresh'

2011-08-25T23:00:24Z

* ac/describe-dirty-refresh: describe: Refresh the index when run with --dirty

Merge branch 'di/parse-options-split'

2011-08-25T23:00:20Z

* di/parse-options-split: Reduce parse-options.o dependencies parse-options: export opterr, optbug

Merge branch 'js/i18n-scripts'

2011-08-25T23:00:16Z

* js/i18n-scripts: submodule: take advantage of gettextln and eval_gettextln. stash: take advantage of eval_gettextln pull: take advantage of eval_gettextln git-am: take advantage of gettextln and eval_gettextln. gettext: add gettextln, eval_gettextln to encode common idiom