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 'rf/maint-mailmap-off-by-one' into maint
2012-10-11
Davi
d
Aguilar
mergetools
/
p4merge: Handle "/dev/nu
l
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
Davi
d
Aguilar
m
e
rgetool
-
-lib: Allow custom command
s
to o
v
erride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
av
i
d
Aguilar
gitk:
R
e
n
ame 'tagconte
n
t
s' to
'
cac
h
e
d
_tagcon
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
uilar
gitk: Teac
h
"Reread refe
r
ences" to
r
e
load tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguil
a
r
merget
o
ol,difftool: Docume
n
t --tool-hel
p
cons
i
stently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difftool: Disabl
e
--symlink
s
o
n
cygwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguil
a
r
diff
t
ool: Ha
n
dle c
o
m
pare(
)
returning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
difftool
:
Wrap long lines fo
r
readabili
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
d
i
fftool: Check
al
l
return cod
e
s fro
m
c
ompar
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David
Aguilar
dif
f
to
o
l
: Handle
fi
n
ding mergetools/ in a
path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use
s
y
mlinks whe
n
diffing against
t
he worktr
e
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
ifftool
:
Call the temp dire
c
t
o
ry "git-difftoo
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
difftool
:
Move
o
pt
i
on va
l
u
e
s into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid A
g
u
i
lar
di
f
ftool: Eliminate global
vari
a
bl
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agui
l
ar
difftool: Simp
l
ify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d A
g
uilar
t7800: Test difft
o
ol passing
arg
u
ments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
i
d Aguil
a
r
mergetool
:
Provid
e
an em
p
t
y
file w
h
en needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id
A
g
u
ilar
Makefile: Improve compiler
h
ea
d
er
d
epende
n
c
y
che
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d Aguilar
mergetools/mel
d
: Use '-
-
outpu
t
'
when availab
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d Agui
l
ar
m
e
rgetool--lib:
Refactor
t
ools
into separat
e
fi
l
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
m
e
rgetool--lib: Make sty
l
e
c
o
nsisten
t
wi
t
h
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
v
i
d Aguilar
dif
f
to
o
l--helpe
r
: Make style
c
onsistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-pr
e
-c
o
mmit
-
hook
.
sh: Add
G
IT_PREFI
X
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git-merg
e
tool--lib: Make
vi
m
d
i
f
f
r
etain the
curre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Remove
handling for GIT_PRE
F
IX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David A
g
u
ilar
se
t
up: Pr
o
vide GI
T
_
P
REFIX to
b
u
i
lt-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
avid Ag
u
i
l
ar
submodule
s
ync: U
p
date "submodule
.
<na
m
e>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
D
avid Ag
u
ilar
mergetool: Sk
i
p
autoreso
l
ve
d
paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
D
avid
Aguil
a
r
Documentation: Explain git-mergetool
'
s use
o
f temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Ag
u
ilar
M
akefile:
R
emove us
a
ge of deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David
Ag
u
ilar
d
i
fftool: Fix '--g
u
i' wh
e
n
d
i
ff
.
guitool
i
s unconfigure
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7
8
0
0-difftoo
l
.
sh: Test mergetool
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid Aguila
r
diff
t
ool: Update copyri
g
ht notic
e
s
t
o
list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftool:
Use eval
to expa
n
d '--extcmd' expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
diff
t
ool: Ad
d
'
-
x' an
d
as
a
n alias for '--ex
t
cmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800
-
difftool
.
sh
:
Simplify the
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
gu
i
lar
g
i
t-diff
.
txt: Link to git-difft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Ag
u
ilar
d
ifftool: All
o
w specifyin
g
u
n
c
o
nf
i
gured command
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
A
g
uilar
d
i
fftool--he
l
per: Remove use of the G
I
T_MERGE
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Ag
u
ilar
dif
f
tool--helper: Update copyright a
n
d re
m
ove distracti
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool: Ad
d
'--g
u
i' for selecting a GUI to
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-di
f
ftool: Set a
bo
g
us too
l
for use by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
v
id
A
guilar
help:
Do n
o
t unnecess
a
rily look fo
r
a re
p
osi
t
ory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David
Aguilar
s
ubmodule
.
c: Squ
e
l
ch a
"u
s
e be
f
ore assignme
n
t" w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
av
i
d Ag
u
ilar
diff: genera
t
e pret
t
y filenames in prep
_
temp_
b
lob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compat: add a basename() compatib
i
lit
y
func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
compat
:
add a
m
kstemps() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
vid
A
g
u
i
l
ar
Add g
i
t-replace to
.
g
i
ti
g
no
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mer
g
e
t
ool-
-
lib: a
d
d support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
v
id Aguil
a
r
mer
g
etool--lib: specialize diff
o
ptions for e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguil
a
r
mergetool--lib: si
m
p
l
ify A
P
I u
s
age by removing
m
ore
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool/mergetool: ref
a
c
tor commands to use git-mer
g
etoo
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
Aguilar
merget
o
ol: use $(
.
.
.
) in
s
t
e
ad
o
f
`backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash completion:
a
dd git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d
Aguilar
difftool
:
add
s
upport for a difftool
.
prompt
c
on
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
difftool: add va
r
ious gi
t
-
d
if
f
tool
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
dif
f
tool:
m
ove
'git
-
d
i
fftoo
l
' out of
c
ontr
i
b
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
i
f
ftool: add a -y shortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool:
use perl built-in
s
when testing for m
s
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: remove
the backup
f
ile
featur
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguila
r
d
if
f
tool:
r
emove m
e
rge
options for opendif
f
,
tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
a
v
id
A
guilar
everyd
a
y: use t
h
e
d
a
s
h
less form
of g
i
t
-
i
ni
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Aguilar
cont
r
ib/
d
ifftool: u
s
e a separate
c
onfig namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guilar
con
t
rib/
d
ifftool: Don't repeat mer
g
e tool
ca
n
d
i
d
ates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
d
iff
t
ool: put the
c
ur
s
or on the editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
av
i
d A
g
uilar
d
i
fftool: fix docum
e
ntation
prob
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguila
r
contr
i
b:
add 'git difftool' for launching com
m
on merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
u
i
lar
git-merget
o
ol: p
r
op
e
rly
h
andle "git mergetool -
-
filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
est
s
: ad
d
a testcase
f
or "git
submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
Aguilar
git-submod
u
le: a
d
d
"
sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
av
i
d Aguilar
git-submo
d
ule: replac
e
duplica
t
ed code wit
h
a mo
d
ule_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
avid Aguilar
[
P
ATCH
]
gitk: Do
n
'
t
show
local
c
h
a
n
ges whe
n
w
e the
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree