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
t3070: Disable some failing fnmatch tests
2012-09-09
Davi
d
Aguilar
git
k
: Rename 'tagconte
n
ts' t
o
'
cached_tagcontent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Davi
d
A
g
uilar
gitk: Teach "Reread references
"
to reload tag
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Dav
i
d A
g
u
i
l
a
r
t7800: Test difftool pas
s
ing argum
e
nts to d
i
f
f
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
Da
v
id A
g
u
i
l
ar
m
e
rgetool:
P
rovide an
empty file w
h
e
n needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Aguila
r
Makefile: I
m
pr
o
ve
c
o
mpiler
h
eader depen
d
ency
c
h
e
ck
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Da
v
id A
g
uilar
mergetools/meld: Use '--outp
u
t' when avail
a
ble
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguilar
m
e
rgetool--lib: Refact
o
r t
o
ols into sep
a
rate
f
ile
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib
:
Make style consistent with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
difftool--help
e
r: Mak
e
style
consi
s
t
e
nt with git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
a
vid Aguil
a
r
t/t
7
50
3
-pre-commit-h
o
ok
.
sh: Add GIT
_
PR
E
FIX t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
avid A
g
u
i
la
r
git-m
e
rgetool--
l
ib
:
Make vimdiff retain t
h
e curr
e
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: Rem
o
ve
h
andling for
GIT_PR
E
FIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguila
r
setup
:
Provid
e
GIT_PR
E
FIX to bui
l
t-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid
Aguilar
submo
d
u
l
e s
y
nc
:
Updat
e
"submodule
.
<name>
.
ur
l
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Ag
u
ilar
mergetoo
l
: Skip a
u
t
oresol
v
ed paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
Aguilar
Documentatio
n
: Expl
a
in g
i
t-m
e
rg
e
t
ool's use of temporary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
M
a
kefile: Remove
usage of
deprecated Python "has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ilar
difftool: Fix
'
--gu
i
' when
di
f
f
.
guitool is unconfigured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800
-
d
if
f
tool
.
sh: Test mergetool
.
prompt
fallba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
Aguilar
difftool: Update cop
y
right notices to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
ilar
difftool: U
s
e eval to exp
a
nd '--extcmd' expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
difftool: Add '-x' a
n
d as a
n
alia
s
for '--extcmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Dav
i
d
A
guilar
t7800
-
diffto
o
l
.
sh: Simpl
i
fy the
--extcmd test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguila
r
git-diff
.
t
x
t
:
Link to git-difft
o
o
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow s
p
ecifying un
c
on
f
igur
e
d command
s
with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Ag
u
i
l
ar
difftool--hel
p
er:
R
emove
u
s
e of
t
he GIT_MERG
E
_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguilar
difftool-
-
helper: Update
c
opyright and remove di
s
t
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guilar
git-
d
ifftool:
A
d
d '
-
-gui'
f
or selecting a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7
8
00-di
f
ftool: Set
a
bogus t
o
o
l
for use b
y
t
e
sts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help:
D
o n
o
t
unneces
s
a
r
il
y
look for a
r
epository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
a
vid
Aguilar
submodule
.
c
:
Squelch a "us
e
b
e
f
or
e
a
ssign
m
ent" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agu
i
lar
diff: gener
a
te pretty fi
l
ena
m
es in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
c
ompat: add a basename()
c
ompatibility f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
compat: add a mkstemps() compatibil
i
ty fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Aguila
r
Add git-rep
l
a
c
e to
.
gitig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguil
a
r
merge
t
ool--lib: add su
p
port for
araxis merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid Aguilar
merget
o
o
l--lib: sp
e
c
i
a
l
ize diff
o
ptions fo
r
em
e
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David A
g
uila
r
m
e
rgetool--
l
ib: simplify API usa
g
e by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
f
f
tool/mer
g
etool: refacto
r
com
m
ands
to
u
s
e g
i
t-m
e
rgeto
o
l
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merge
t
ool: use
$(
.
.
.
) instead
of `ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id
A
g
uil
a
r
bash c
o
mpl
e
tion
:
add
g
it-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agu
i
lar
difftool: add suppor
t
for a difftool
.
pr
o
mpt con
f
ig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
il
a
r
difftool: add various git-dif
f
tool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid
A
guilar
difftool: move 'g
i
t-difftool' out
of co
n
trib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
dif
f
tool: add a -y shor
t
cu
t
for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
difftool: use
perl built-i
n
s when t
e
sting for ms
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
difftool: remove
t
he backup file featu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: re
m
o
ve merge o
p
ti
o
ns for opendiff, tk
d
i
ff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Aguila
r
everyda
y
:
u
se the dashless
f
orm of
g
it
-
init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contrib/difftool: use a
separa
t
e config
n
amespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
A
guila
r
c
ontr
i
b/difftool: Don't r
e
peat merge
to
o
l
c
a
ndidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Agu
i
lar
diff
t
ool: put
t
he
c
ursor on the editable f
i
le for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
di
f
ftool: fix docu
m
entation pr
o
blems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
avid A
g
uilar
contr
i
b
:
add 'g
i
t diff
t
ool' f
o
r
launching common
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David A
g
ui
l
a
r
git
-
mergetool:
p
r
o
p
erly ha
n
dle "git merge
t
oo
l
--
file
n
a
m
e"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
avi
d
Aguilar
t
e
sts: add a te
s
tcas
e
for "gi
t
su
b
modul
e
sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-submod
u
le: add "sync" comm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David
A
guilar
g
it-su
b
module:
r
eplace
dup
l
icated code
w
i
t
h a
m
odule
_
list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David
A
guil
a
r
[PATCH] gitk: Don't sh
o
w local change
s
when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree