repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool--lib: improve show_tool_help() output
2013-01-28
D
avid Ag
u
i
l
a
r
m
e
r
geto
o
l--li
b
: improve sho
w
_t
o
ol_
h
el
p
()
o
utp
u
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
D
a
vid Ag
u
ilar
me
r
getools
/
vim:
remove
redunda
n
t diff
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mer
g
etool--lib: All
o
w custom
c
ommands t
o
ove
r
ride built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
gi
t
k: Rename '
t
agcontents' to 'cached_
t
agcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d
A
guilar
gitk: Te
a
ch "Reread references" to reload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
id Aguila
r
merg
e
t
ool,difftool: Document -
-
tool-help co
n
sistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
difftoo
l
: Di
s
able --symli
n
ks o
n
c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Handle compare
(
) r
e
t
u
rning -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d A
g
uilar
diff
t
ool:
W
rap long
l
ines
for readabi
l
i
t
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Agui
l
a
r
d
i
fftool: Che
c
k
all
retu
r
n
codes from co
m
par
e
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: H
a
ndle finding merget
o
ols/ in a
pa
t
h w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
d
iffto
o
l:
U
se
s
ymlinks when diffing again
s
t
th
e
w
o
rktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
di
f
ftool
:
C
all
t
he temp directory "
g
it
-
difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Move
o
ption values into a ha
s
h
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
difft
o
ol: Eliminate global variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Simplify print_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguilar
t7800: Test
difftool p
a
ssin
g
arguments to d
i
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Aguilar
mergetoo
l
:
P
ro
v
ide an
empt
y
file
w
hen needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id
A
g
u
ilar
Makefile: Im
p
rove compile
r
h
e
a
d
er d
e
pendency chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
av
i
d A
g
u
ilar
mer
g
etools/meld:
U
se
'--output' when
a
v
a
ilable
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid Agu
i
lar
me
r
getool--lib:
R
efact
o
r tools into separ
a
t
e
files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David
A
g
u
il
a
r
m
e
r
getool--li
b
: Make s
t
yle con
s
i
s
ten
t
with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
difftool--helper: Make style co
n
sistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
David
A
guil
a
r
t/t7503-pre-commit-hook
.
sh: Ad
d
G
I
T_PREFIX
t
ests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
l
a
r
git-merget
o
ol--lib: Make v
i
mdiff re
t
ain the
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Agu
i
lar
git: Remov
e
h
andl
i
ng for
G
IT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
s
e
t
up: Provide
GIT_PREFIX to bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
subm
o
dule syn
c
: U
p
date "s
u
bmodule
.
<name>
.
ur
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David
A
guilar
me
r
g
e
tool: Skip autor
e
solved
path
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
Do
c
ument
a
tion: Explain git-
m
er
g
eto
o
l's us
e
o
f
tempo
r
ary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
D
a
vid A
g
uilar
Mak
e
f
i
le
:
Remove usage of d
e
p
recated Python "has_k
e
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Da
v
id Aguil
a
r
diff
t
ool: Fix '-
-
gui'
w
hen
diff
.
gui
t
ool is
u
nconfi
g
u
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
Da
v
id Ag
u
il
a
r
t7800-diffto
o
l
.
sh
:
Test m
e
rgetool
.
promp
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Ag
u
ilar
difftool: Update c
o
pyr
i
g
h
t not
i
ces to l
i
s
t each yea
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool: Use
e
v
al to
expan
d
'--extcmd'
expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool:
A
dd '-x
'
and as an a
l
ias
fo
r
'--
e
xtcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
av
i
d
Aguilar
t78
0
0-difftool
.
sh: Simplify the
-
-extcm
d
test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
git-
d
if
f
.
t
xt:
L
in
k
to git-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
i
d Aguilar
difftool:
A
llow specifyi
n
g unconfigu
r
ed comman
d
s with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fftool--h
e
lper: R
e
mo
v
e use
o
f the GIT_MERGE_TO
O
L
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool-
-
helpe
r
: U
p
date co
p
y
right and remove d
i
s
t
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
av
i
d Aguila
r
g
i
t-di
f
f
t
ool: Add '--gui'
f
o
r selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
il
a
r
t780
0
-
d
iffto
o
l
:
Se
t
a bogus
t
o
ol for
use
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help:
D
o not unnecessarily look fo
r
a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
avid A
g
uil
a
r
su
b
module
.
c: Squelch a
"use befo
r
e as
s
ign
m
ent" war
n
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Aguil
a
r
diff: generate pre
t
ty
f
il
e
name
s
in prep_temp_b
l
ob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat
:
add a ba
s
en
a
me
(
)
compatibility func
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
compa
t
:
a
dd a m
k
ste
m
p
s() com
p
atibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
Ad
d
git-rep
l
ace
to
.
gi
t
ignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Davi
d
Aguilar
mergeto
o
l--lib: a
d
d support for araxis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Agui
l
ar
merge
t
ool--lib: specialize diff options fo
r
em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
merget
o
o
l
--li
b
:
s
implify API usa
g
e
by r
e
m
ovi
n
g more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difft
o
ol/mergeto
o
l: refact
o
r commands
to
u
se gi
t
-
m
erget
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
merget
o
ol: use $
(
.
.
.
) ins
t
ead of `b
a
cktick
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
bash completion: add git-
d
ifft
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
difftool: add su
p
p
o
rt f
o
r a
d
ifftool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difft
o
o
l
: add var
i
ous git-diff
t
ool
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difftool: move 'git-d
i
fftool
'
out of co
n
trib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: add a -y shortcut for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: use perl bu
i
lt-i
n
s when test
i
ng for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool:
r
emove
the backup
f
ile feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid A
g
uilar
dif
f
tool: remove me
r
ge
options for opendif
f
, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Aguilar
everyday:
use the
d
ashless
f
orm of git-i
n
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
tr
i
b/diff
t
ool: us
e
a
separate confi
g
n
ames
p
ace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Agui
l
ar
contrib/difftool:
Don't r
e
peat me
r
g
e
tool
c
andida
t
es
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id Aguilar
difftool:
put the
c
urs
o
r on the
edit
a
ble f
i
l
e for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid Ag
u
ilar
difftoo
l
: fix
d
ocumentat
i
on problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David Aguil
a
r
contr
i
b: add 'git difftool' f
o
r launching common
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
avid Aguilar
git-mer
g
etool:
p
r
op
e
rly h
a
ndle
"git mergetool --
f
ilename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
Aguil
a
r
tests
:
add a
testca
s
e for "gi
t
submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Agui
l
ar
g
it-submo
d
u
l
e: ad
d
"sync
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David
Ag
u
ilar
git-submodu
l
e: re
p
la
c
e duplicat
e
d code w
i
th a mod
u
le_l
i
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
PA
T
CH] gitk:
D
on't show local change
s
when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree