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
imap-send.c: remove msg_data::flags, which was always zero
2012-12-27
David Aguilar
m
e
rgetools/p4
m
erge: Honor $TM
P
DIR for the /dev/nu
l
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
a
v
id Aguilar
mergetool
s
/p4merg
e
: Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--
l
ib: Al
l
o
w
custom co
m
mands to
ove
r
ride built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: Rename
'ta
g
con
t
ent
s
' to
'cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
g
itk:
T
each "Rerea
d
refe
r
ences" t
o
reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguila
r
mergetool,difftool: Document --tool-h
e
lp c
o
nsistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Agu
i
lar
diff
t
ool: Dis
a
ble --symlinks on cy
g
win
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
Aguilar
difftool: Handle c
o
mpare(
)
returni
n
g -
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
diff
t
ool: Wra
p
lon
g
lines f
o
r readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difft
o
ol: Check all return
c
odes from c
o
mpar
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Dav
i
d A
g
uil
a
r
difftool: Hand
l
e
f
inding
mergeto
o
ls/ in a path
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Use symlinks whe
n
di
f
fin
g
again
s
t t
h
e
worktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
di
f
ftool: Call the
t
em
p
direc
t
ory "git-diffto
o
l"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
d
iffto
o
l: Move option values
into a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
too
l
: Elim
i
n
a
te g
l
ob
a
l
vari
a
ble
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Simplify print_tool_
h
elp()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
A
guil
a
r
t7800: Test
d
ifftool pas
s
ing argume
n
t
s to di
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Agui
l
ar
mergeto
o
l: P
r
ovide an empty file when n
e
eded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
D
a
vi
d
Agu
i
l
ar
Ma
k
efile: Improv
e
comp
i
ler h
e
ader dependenc
y
chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
mergetools/meld:
U
s
e '--out
p
u
t
' w
h
en a
v
ailable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
i
d
Aguilar
mergetool--li
b
: Refactor
t
ools into separate fil
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Aguilar
merge
t
ool--lib: Make style c
o
nsiste
n
t wi
t
h git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
u
i
l
ar
d
ifftool--
h
elper: Make style consistent with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David A
g
uilar
t/t
7
503-pre-co
m
mit
-
hoo
k
.
sh: Ad
d
GIT_PREFIX
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git-merg
e
tool
-
-lib:
Make v
i
mdiff reta
i
n the c
u
rr
e
nt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avi
d
Agui
l
ar
git
:
R
emove handling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
setup: Pr
o
v
i
de GIT
_
PREFIX to built-i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule
s
ync: U
p
date "s
u
bm
o
dule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: S
k
ip autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
ar
Docume
n
tation: Explain
g
it
-
mergetool's use of t
e
mpo
r
a
r
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Da
v
id Aguilar
M
a
kefile:
Remove usage
o
f deprecate
d
Python
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool: Fix '--gui' when
d
iff
.
gui
t
ool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Aguil
a
r
t
7
80
0
-
difftool
.
sh: Test mergeto
o
l
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
guil
a
r
difftool: Updat
e
cop
y
right n
o
tices to list each
y
e
ar
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Aguilar
difftool: Use eval to
e
xpand '--
e
xtcmd' e
x
p
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d Ag
u
ilar
difftool: Ad
d
'
-x' and
as an a
l
ias for '
-
-extc
m
d
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
A
guilar
t7800-difftoo
l
.
sh: S
i
m
p
lify th
e
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguil
a
r
git
-
diff
.
t
x
t: Link to git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol: All
o
w specifying
u
n
configured co
m
mands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
dif
f
tool--helper:
Re
m
o
v
e us
e
of
t
h
e GIT_
M
ERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
difftool--helper: Update copyrig
h
t and remove
distractin
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid
A
gui
l
ar
git-difftool: Add '--gu
i
'
f
or selecting a GU
I
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vid Aguila
r
t
7
800-difftoo
l
: Set a
bogus tool for use by t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Ag
u
i
lar
he
l
p: D
o
n
ot unnece
s
sarily look f
o
r
a
reposit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguil
a
r
submodule
.
c: Squelch a "use bef
o
re assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff: generat
e
p
r
etty
f
ilenames in prep_t
e
mp_b
l
ob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
comp
a
t: ad
d
a b
a
se
n
ame() compa
t
i
bility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Agu
i
l
a
r
compat: add
a
m
k
s
t
emps() compatibili
t
y
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
A
d
d git-re
p
lace to
.
gitign
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Agu
i
l
a
r
mer
g
etool--lib: add suppor
t
for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mer
g
etool
-
-lib:
s
pecia
l
ize diff opt
i
ons fo
r
eme
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Aguil
a
r
mergetool--lib: simpli
f
y API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
d
ifftool/mergetool: refactor
commands to use gi
t
-merge
t
ool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
m
e
r
getool: use
$(
.
.
.
) ins
t
ead
of
`backtic
k
s`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
bash comp
l
e
t
ion: add git-diff
t
ool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool
:
add suppo
r
t for a difftool
.
prompt confi
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
gu
i
lar
d
if
f
tool:
add variou
s
gi
t
-
d
if
f
tool te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguil
a
r
difft
o
o
l: move 'g
i
t-dif
f
tool' out
of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftoo
l
: add
a -y s
h
ortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
di
f
ftool: use perl
bu
i
lt
-
ins when t
e
st
i
ng f
o
r m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
a
r
difftool: remove the b
a
c
kup fil
e
featu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: re
m
ove
m
erge option
s
for opendiff, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Agui
l
ar
everyday: use
t
h
e dashless
form o
f
g
i
t-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agu
i
lar
co
n
trib/diffto
o
l:
u
se a separa
t
e co
n
f
i
g names
p
ace fo
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguil
a
r
contri
b
/
difftool: Don't re
p
eat m
e
rge tool
c
a
ndid
a
te
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Ag
u
ilar
difftool: put the cu
r
sor on th
e
e
d
itable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
d
i
ff
t
o
o
l
: f
i
x docum
e
n
t
at
i
on
problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
Aguilar
c
o
ntrib: add 'git di
f
fto
o
l' for
lau
n
ch
i
n
g
c
ommon merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
i
t-merget
o
ol: prope
r
ly ha
n
dle
"
git
m
e
rg
e
tool
-- file
n
ame"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avid Aguilar
te
s
t
s
: ad
d
a
testcase for "git sub
m
odule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David
A
guilar
git-submo
d
ule: add
"syn
c
"
com
m
a
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David A
g
u
ilar
git-s
u
b
module: replace duplicated
code with a module_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid
A
g
uilar
[PAT
C
H] gitk:
Don't s
h
ow loc
a
l chan
g
es w
h
en we
ther
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree