diff --git a/Documentation/diff-context-options.adoc b/Documentation/diff-context-options.adoc
new file mode 100644
index 000000000000..e161260358ff
--- /dev/null
+++ b/Documentation/diff-context-options.adoc

@@ -0,0 +1,10 @@
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset.

diff --git a/add-interactive.c b/add-interactive.c

[...]

@@ -98,6 +99,17 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
  	repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
  	if (s->use_single_key)
  		setbuf(stdin, NULL);
+
+	if (add_p_opt->context != -1) {
+		if (add_p_opt->context < 0)
+			die(_("%s cannot be negative"), "--unified");
+		s->context = add_p_opt->context;
+	}
+	if (add_p_opt->interhunkcontext != -1) {
+		if (add_p_opt->interhunkcontext < 0)
+			die(_("%s cannot be negative"), "--inter-hunk-context");
+		s->interhunkcontext = add_p_opt->interhunkcontext;
+	}

@@ -1031,10 +1047,13 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
  	if (count > 0) {
  		struct child_process cmd = CHILD_PROCESS_INIT;
  
-		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached",
-			     oid_to_hex(!is_initial ? &oid :
-					s->r->hash_algo->empty_tree),
-			     "--", NULL);
+		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached", NULL);
+		if (s->context != -1)
+			strvec_pushf(&cmd.args, "--unified=%i", s->context);
+		if (s->interhunkcontext != -1)
+			strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->interhunkcontext);
+		strvec_pushl(&cmd.args, oid_to_hex(!is_initial ? &oid :
+			     s->r->hash_algo->empty_tree), "--", NULL);

diff --git a/builtin/checkout.c b/builtin/checkout.c

[...]

@@ -564,8 +575,13 @@ static int checkout_paths(const struct checkout_opts *opts,
  		else
  			BUG("either flag must have been set, worktree=%d, index=%d",
  			    opts->checkout_worktree, opts->checkout_index);
-		return !!run_add_p(the_repository, patch_mode, rev,
-				   &opts->pathspec);
+		return !!run_add_p(the_repository, patch_mode, &add_p_opt,
+				   rev, &opts->pathspec);
+	} else {
+		if (opts->patch_context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
+		if (opts->patch_interhunk_context != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
  	}

diff --git a/builtin/stash.c b/builtin/stash.c

[...]

@@ -1826,8 +1831,15 @@ static int push_stash(int argc, const char **argv, const char *prefix,
  		die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
  	}
  
+	if (!patch_mode) {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
+	}
+

@@ -1877,8 +1892,17 @@ static int save_stash(int argc, const char **argv, const char *prefix,
  		stash_msg = strbuf_join_argv(&stash_msg_buf, argc, argv, ' ');
  
  	memset(&ps, 0, sizeof(ps));
+
+	if (!patch_mode) {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");

diff --git a/commit.h b/commit.h

[...]
  #include "object.h"
+#include "add-interactive.h"
  struct signature_check;
  struct strbuf;

diff --git a/parse-options.h b/parse-options.h

[...]
+#define OPT_DIFF_UNIFIED(v) OPT_INTEGER_F('U', "unified", v,
  N_("generate diffs with <n> lines context"), PARSE_OPT_NONEG)

diff --git a/t/t4032-diff-inter-hunk-context.sh b/t/t4032-diff-inter-hunk-context.sh
index bada0cbd32f7..d5aad6e143a7 100755
--- a/t/t4032-diff-inter-hunk-context.sh
+++ b/t/t4032-diff-inter-hunk-context.sh

@@ -47,6 +47,31 @@ t() {
  	"
  }
  
+t_patch() {
+	use_config=
+	git config --unset diff.interHunkContext
+
+	case $# in
+	4) hunks=$4; cmd="add -p -U$3";;
+	5) hunks=$5; cmd="add -p -U$3 --inter-hunk-context=$4";;
+	6) hunks=$5; cmd="add -p -U$3"; git config diff.interHunkContext $4; use_config="(diff.interHunkContext=$4) ";;
+	esac
+	label="$use_config$cmd, $1 common $2"
+	file=f$1
+
+	if ! test -f $file
+	then
+		f A $1 B >$file
+		git add $file
+		git commit -q -m. $file
+		f X $1 Y >$file
+	fi
+
+	test_expect_success "$label: count hunks ($hunks)" "
+		test $(test_write_lines q | git $cmd $file | sed -n 's/^([0-9]*\/\([0-9]*\)) Stage this hunk.*/\1/p') = $hunks
+	"
+}
+
  cat <<EOF >expected.f1.0.1 || exit 1
  diff --git a/f1 b/f1
  --- a/f1

@@ -107,6 +132,42 @@ t 3 lines	1	2	1	config
  t 9 lines	3	2	2	config
  t 9 lines	3	3	1	config
  
+# common lines	ctx	intrctx	hunks
+t_patch 1 line	0		2
+t_patch 1 line	0	0	2
+t_patch 1 line	0	1	1
+t_patch 1 line	0	2	1
+t_patch 1 line	1		1
+
+t_patch 2 lines	0		2
+t_patch 2 lines	0	0	2
+t_patch 2 lines	0	1	2
+t_patch 2 lines	0	2	1
+t_patch 2 lines	1		1
+
+t_patch 3 lines	1		2
+t_patch 3 lines	1	0	2
+t_patch 3 lines	1	1	1
+t_patch 3 lines	1	2	1
+
+t_patch 9 lines	3		2
+t_patch 9 lines	3	2	2
+t_patch 9 lines	3	3	1
+
+#					use diff.interHunkContext?
+t_patch 1 line	0	0	2	config
+t_patch 1 line	0	1	1	config
+t_patch 1 line	0	2	1	config
+t_patch 9 lines	3	3	1	config
+t_patch 2 lines	0	0	2	config
+t_patch 2 lines	0	1	2	config
+t_patch 2 lines	0	2	1	config
+t_patch 3 lines	1	0	2	config
+t_patch 3 lines	1	1	1	config
+t_patch 3 lines	1	2	1	config
+t_patch 9 lines	3	2	2	config
+t_patch 9 lines	3	3	1	config
+