repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'lf/setup-prefix-pathspec'
2013-02-25
David Agui
l
ar
co
n
t
rib/mw-to-git/t/inst
a
ll-wiki
.
sh: use
a
lower
c
ase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
co
n
trib/examples/
g
i
t
-r
e
mote
.
p
erl:
use a
l
owercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid Agui
l
a
r
tests: use
a lower
c
ase "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
D
avid
Aguilar
git-s
v
n: use a lo
w
ercase "usag
e
:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
Documentation/user-manual
.
tx
t
: use a low
e
rca
s
e "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Aguilar
templates/hooks--u
p
d
a
t
e
.
sa
m
ple:
use
a
lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
on
t
rib/hooks/setgitperms
.
pe
r
l
:
use a l
o
werc
a
se "usag
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
contr
i
b/
e
xamples: u
s
e
a lowercase "usa
g
e:"
s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
contri
b
/
f
a
st-import/
i
mport-
z
ips
.
py: us
e
spaces instead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
contrib/fast-import/import-zips
.
p
y: fix broken error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
Aguila
r
contrib/f
a
st
-
import
:
use a lowercase "u
s
age:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vid Agui
l
ar
contrib/cred
e
n
t
ia
l
: u
s
e a
lowercase "usage
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Ag
u
ilar
git-cvsim
p
ort: use a lowercase "u
s
age:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
avid Aguilar
git-cvsimport:
use a lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Agu
i
l
a
r
git-cvsexportcom
m
it: use a lowercas
e
"usage:
"
string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-archimport: use
a lowercase "u
s
age
:
" stri
n
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-mer
g
e
-
one-file
:
use a lowercas
e
"
usage:"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David A
g
uilar
git-relink: use a lowercase
"usage:" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
g
i
t-svn: use
a
lowercase "usa
g
e:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git-sh-
s
etup
:
use a lowercas
e
"usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: "defaults" is
no longer
a
builtin tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David
A
guilar
t7800: mo
d
e
rnize
t
e
s
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
Dav
i
d
Aguilar
t
7
800: u
p
date
copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David Aguilar
diff
t
ool:
s
ilence uniniti
a
liz
e
d var
i
able warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David A
g
uilar
p4
m
erge: f
i
x
printf u
s
age
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguil
a
r
d
i
fftool--helper: fix printf
usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
David
Aguilar
doc: generate a
list of valid merge tools
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
Da
v
id Ag
u
i
lar
mergeto
o
l-
-
li
b
: add functio
n
s for finding available
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Agu
i
l
ar
merge
t
oo
l
--lib:
i
mprove t
h
e
hel
p
text in
g
u
e
ss_merge_
t
ool()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David
A
g
u
i
l
a
r
m
e
rg
e
t
o
ol
-
-
l
i
b
: simplify command expressio
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetools
:
simpl
i
fy how we handle "vim
"
and "defau
l
ts"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David
Aguilar
merge
t
ool--lib: i
m
prove
s
how_to
o
l_help() outpu
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Agui
l
ar
m
e
r
g
etoo
l
s/vim:
remove r
e
du
n
dan
t
diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mergetools/p4
m
er
g
e: Honor $TMPDIR
fo
r
t
h
e /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
Da
v
id Ag
u
ilar
mergetools/
p
4merge: Handle "/de
v
/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David A
g
uilar
merg
e
t
o
ol--lib: Allow custom commands
t
o override built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Agui
l
a
r
gitk: Rename 'tagcontents' t
o
'cac
h
ed_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gitk: Te
a
ch "Reread refere
n
ces" t
o
re
l
oad ta
g
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,
d
ifftool: Docum
e
nt --tool-help consistentl
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: D
i
sable
--symlinks on
c
yg
w
in
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Davi
d
Aguil
a
r
difftool: Handl
e
compar
e
() returning -
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
ftool
:
Wrap long lines f
o
r re
a
d
ability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
d
i
fftool: Check all return codes from
c
ompare(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David A
g
uilar
difftool: Handle
finding
m
erge
t
o
ols/ in
a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks when diffing
a
gainst
the
worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguil
a
r
difftool:
Call the temp directo
r
y "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
d
ifftool: M
o
v
e
option
v
alue
s
int
o
a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Eli
m
inat
e
global vari
a
bles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
A
g
uilar
difftool:
Simplify p
r
int_t
o
ol_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d Aguilar
t7800: Te
s
t
difftool passing argu
m
en
t
s to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
Aguilar
mergetool: Provide a
n
empty file whe
n
need
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Agui
l
ar
M
a
kef
i
le: Improve com
p
iler header depe
n
den
c
y check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
merge
t
ools/meld: Use '--outp
u
t' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id Aguilar
m
e
rgetool--
l
ib: Refactor tools into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
Aguilar
m
er
g
e
t
oo
l
--lib: Mak
e
style c
o
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguil
a
r
difftool
-
-hel
p
er: Make s
t
y
le consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Agu
i
lar
t/t7503-pre-commit-hook
.
sh: Add GI
T
_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
g
it-me
r
getoo
l
--li
b
: Make
v
imdiff
r
etain the current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid
A
guilar
g
i
t: Remove
h
andling
fo
r
GIT
_
PR
E
FIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Da
v
id
Aguilar
setu
p
: Pr
o
vide GIT_PREFIX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David
Aguilar
s
u
bmodule
sync: U
p
date
"su
b
m
od
u
le
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
m
e
rge
t
o
o
l: Skip autoresolved
p
aths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Docum
e
n
t
a
t
ion: Explain git-mergetool'
s
use o
f
temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefil
e
: Rem
o
ve u
s
age of deprec
a
t
ed
Pytho
n
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid Aguil
a
r
difftool: Fix '--gui'
w
he
n
dif
f
.
g
uitool is u
n
c
onfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguil
a
r
t7800
-
d
ifftool
.
sh: Test mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id Aguilar
d
i
f
ft
o
ol: Upd
a
te copyr
i
gh
t
n
o
t
i
c
e
s to list e
a
c
h year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool:
Use eval
to expand
'
-
-
extcmd' expressi
o
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Agu
i
lar
di
f
f
tool: Add '-
x
' and as an alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
Ag
u
i
l
ar
t7800-difftool
.
sh: Simplify
the -
-
extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d
Aguilar
g
i
t-diff
.
txt: Link to git-d
i
ff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool:
A
l
lo
w
specifying unconfigured commands
w
i
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
difftool--helper:
R
emove
use
o
f
th
e
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difft
o
ol--helper: Update cop
y
r
i
g
ht and
r
emove distracting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguilar
git-diff
t
o
ol:
A
dd '--gui'
for s
e
lecting a GUI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d Aguil
a
r
t7800-difftool: Set a bogus tool for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do
n
ot unnecessarily look for a repos
i
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
s
ubm
o
dule
.
c:
Squelch
a
"us
e
before a
s
s
ignment
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff
:
g
e
nerate pretty filenames in prep_temp_blo
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
com
p
at:
a
dd a
b
asenam
e
()
c
ompatibility functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: a
d
d a mkstemps()
c
ompati
b
i
lity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
i
d
A
guilar
A
dd git-replace t
o
.
gitign
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David
Agu
i
lar
mergetool--lib:
a
dd support
f
or a
r
axis
m
e
r
ge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguilar
m
e
rgetool
-
-lib:
s
peciali
z
e diff option
s
for eme
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Aguilar
merg
e
tool--lib:
simplify API
u
sage
b
y
re
m
ovi
n
g
m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
dif
f
tool/
m
ergeto
o
l: refactor commands
t
o use git-
m
e
rgeto
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
lar
merget
o
ol: use $(
.
.
.
) instead of `backtic
k
s`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
f
tool: add supp
o
rt for a
d
if
f
tool
.
p
r
ompt c
o
nfig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
d
i
fftool: add
various git-difft
o
ol test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move
'
git-di
f
f
t
oo
l
'
out o
f
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
i
l
ar
difftool: add a
-y
shor
t
cut for
-
-no
-
prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
diffto
o
l: use pe
r
l
b
uilt-i
n
s when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove the backup file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
dif
f
tool
:
remove m
e
r
ge options fo
r
opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
eve
r
yd
a
y: u
s
e the dashless form o
f
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id Aguilar
contrib/diffto
o
l: use a s
e
parate
c
onfig
n
a
mes
p
a
ce for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guilar
contrib/di
f
fto
o
l: Do
n
't repeat merg
e
tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
ifft
o
o
l
: put t
h
e c
u
rsor on the edit
a
bl
e
file for
V
im
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguil
a
r
difftool: fix
documentatio
n
problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next