diff options
| author | Juergen Daubert <jue@jue.li> | 2015-07-28 13:31:34 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2015-07-28 13:31:34 +0200 |
| commit | c725f431968130cc05f9012700a94a0c36ad7183 (patch) | |
| tree | bc1ac0747830f0cfa48aa6a7ebe15989f7a0d67f /git/.footprint | |
| parent | 06a8ca0eac6dfecfd000fe07039275ae64161ce7 (diff) | |
| parent | 646dba2ea78e1384b3a0142df1da773a11cbda14 (diff) | |
| download | opt-c725f431968130cc05f9012700a94a0c36ad7183.tar.gz opt-c725f431968130cc05f9012700a94a0c36ad7183.tar.xz | |
Merge branch '3.1' into 3.2
Diffstat (limited to 'git/.footprint')
| -rw-r--r-- | git/.footprint | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git/.footprint b/git/.footprint index c7630cac4..b3593f250 100644 --- a/git/.footprint +++ b/git/.footprint @@ -176,6 +176,7 @@ drwxr-xr-x root/root usr/lib/git-core/ -rwxr-xr-x root/root usr/lib/git-core/git-verify-tag -rwxr-xr-x root/root usr/lib/git-core/git-web--browse -rwxr-xr-x root/root usr/lib/git-core/git-whatchanged +-rwxr-xr-x root/root usr/lib/git-core/git-worktree -rwxr-xr-x root/root usr/lib/git-core/git-write-tree drwxr-xr-x root/root usr/lib/git-core/mergetools/ -rw-r--r-- root/root usr/lib/git-core/mergetools/araxis @@ -200,6 +201,7 @@ drwxr-xr-x root/root usr/lib/git-core/mergetools/ -rw-r--r-- root/root usr/lib/git-core/mergetools/vimdiff -rw-r--r-- root/root usr/lib/git-core/mergetools/vimdiff2 -rw-r--r-- root/root usr/lib/git-core/mergetools/vimdiff3 +-rw-r--r-- root/root usr/lib/git-core/mergetools/winmerge -rw-r--r-- root/root usr/lib/git-core/mergetools/xxdiff drwxr-xr-x root/root usr/lib/perl5/ drwxr-xr-x root/root usr/lib/perl5/5.22/ @@ -374,6 +376,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/git-verify-tag.1.gz -rw-r--r-- root/root usr/man/man1/git-web--browse.1.gz -rw-r--r-- root/root usr/man/man1/git-whatchanged.1.gz +-rw-r--r-- root/root usr/man/man1/git-worktree.1.gz -rw-r--r-- root/root usr/man/man1/git-write-tree.1.gz -rw-r--r-- root/root usr/man/man1/git.1.gz -rw-r--r-- root/root usr/man/man1/gitk.1.gz |