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
perf: update documentation of GIT_PERF_REPEAT_COUNT
2013-02-10
Da
v
id Aguilar
p4m
e
rge: fix printf usa
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
d
ifftool--he
l
per: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
D
a
vid Aguilar
mergetool
s
/
p
4merge: Hono
r
$TMPD
I
R for
t
he /dev/null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
D
avid Aguilar
mergetools/p
4
m
e
rge
:
Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
mergetool--lib: A
l
low custom command
s
to override built-
i
ns
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
i
l
a
r
gitk:
Rename 'tagcontents' to 'cached_ta
g
content'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
D
avid Aguilar
gitk: Te
a
ch "Reread referen
c
e
s" to
r
eload tags
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
Da
v
i
d Agu
i
lar
mergetoo
l
,difftool: Document --t
o
o
l
-
help
con
s
i
sten
t
ly
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difft
o
ol
:
D
i
sab
l
e --symlinks on cygwi
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
id Agu
i
lar
difftool: Handle compare() re
t
urn
i
n
g -1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
d
ifftool: Wrap l
o
ng li
n
es for readabilit
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
a
vid
Aguilar
d
i
fftool: Check all return code
s
from compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: Handle fin
d
ing
m
erge
t
ools/
i
n a path with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguila
r
difftool: Use symlinks when d
i
ffing
a
ga
i
n
s
t
t
h
e
w
orktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguilar
difft
o
ol: Call t
h
e temp dir
e
ctory
"g
i
t
-
d
iff
t
ool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
i
d
Aguilar
difftool: Move
o
ption val
u
es into
a
hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
diff
t
ool: El
i
minate global
v
ariables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid
Aguil
a
r
difftool
:
Simpl
i
fy
p
rint_tool_help()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
Davi
d
A
g
uilar
t
7
800: Test difft
o
ol passi
n
g
a
rguments t
o
diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David Ag
u
ilar
m
e
rgetool: Provide an empt
y
f
i
le when needed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
Da
v
id
A
guilar
Makefile: Improve co
m
p
i
ler header
d
ependency check
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David A
g
uilar
m
ergetools/meld
:
Use '--o
u
tput' when available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
o
l--lib: Refactor t
o
ols
i
nto separate f
i
les
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Dav
i
d A
g
uila
r
mergetool--li
b
:
Make style c
o
ns
i
s
t
e
n
t
w
it
h
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
D
avid
Agu
i
la
r
difftool--helper: Make sty
l
e consistent with
git
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
D
a
vid Aguila
r
t/t7503-pre-commit
-
h
ook
.
sh: Ad
d
GI
T
_PR
E
F
I
X tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David
A
guil
a
r
git-mergeto
o
l--
l
ib: Make vim
d
iff retain the
curre
n
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
git
:
Remove handling for GIT_PREFI
X
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
A
g
uila
r
s
e
tup: Provide GIT_PRE
F
IX to built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
vid Agui
l
ar
submodule sync
:
Update "submodule
.
<name>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
David Ag
u
ila
r
mergetool: Sk
i
p autoresolved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Agui
l
a
r
D
o
cumentation
:
Explain git-mergetool's
use
of tem
p
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguil
a
r
Makef
i
le:
Remove usage o
f
depreca
t
ed
P
ython
"has_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid Aguila
r
d
if
f
tool: Fix '--gui' when d
i
f
f
.
guitool is
u
nco
n
figu
r
ed
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid
Aguilar
t7800-difftool
.
s
h
: Test mergetool
.
prompt fallba
c
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Update co
p
yright notice
s
to list e
a
ch
y
ear
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
dif
f
tool: Use eval to expand '--extcmd' expres
s
ions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool: Add '
-
x'
a
n
d as an
a
lias for '--e
x
tcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t780
0
-
diff
t
ool
.
sh:
S
i
m
p
l
ify the --extc
m
d test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
git-di
f
f
.
txt: L
i
nk to g
i
t-
d
i
f
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Aguilar
di
f
ftool: Allow specifying
unconfig
u
red commands
wi
t
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
difftool--helper
:
Remove use of
the GI
T
_MERGE
_
TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
difftool--
h
el
p
er
:
Update
c
opyright
a
n
d remove distract
i
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David A
g
uil
a
r
g
i
t-d
i
f
f
tool:
A
dd '--gui' for selecting a GUI too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t78
0
0-difftool
:
Set a bogus tool for use by tes
t
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help: Do not unnecessarily look for
a repository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguil
a
r
submodule
.
c: Squelch a "u
s
e be
f
o
r
e
as
s
ignmen
t
" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid A
g
uilar
di
f
f: generat
e
pre
t
ty
filen
a
mes
in prep_temp_blo
b
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agu
i
lar
compat
:
add a basena
m
e() com
p
atibil
i
ty function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uilar
compat: add a
mkstemps() compatibility func
t
i
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
i
d Aguilar
Add git-re
p
lace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid
Aguilar
mergetool--li
b
: add suppo
r
t for araxis
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
i
lar
mergetool--lib: specialize diff opti
o
n
s f
o
r emer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
D
avid Ag
u
ilar
merg
e
t
o
ol
-
-li
b
: simplif
y
A
P
I us
a
ge by remo
v
i
n
g more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
diff
t
ool/me
r
get
o
ol: refac
t
or
comman
d
s to us
e
git
-
mer
g
etool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
mer
g
et
o
ol: use $(
.
.
.
) in
s
tead of `b
a
ckticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
bash completion: ad
d
git-d
i
fftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add support fo
r
a difft
o
ol
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
dif
f
tool: add
v
a
r
i
ous git-difftoo
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
difftool: move 'g
i
t-d
i
ffto
o
l' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
difftool: add a -y shortcu
t
for --no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
g
u
ilar
difftool: use
perl built-ins wh
e
n
testing
f
o
r
m
s
ys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
av
i
d Agu
i
lar
difftool:
remove
the backu
p
file feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove
merge
o
p
t
i
ons fo
r
opendi
f
f, tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
everyda
y
:
u
s
e the dashless
form
of g
i
t-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
a
vid Aguilar
contr
i
b/difftoo
l
: use a
s
eparate config n
a
m
espace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David A
g
uilar
contrib/d
i
fftool: Don't repeat merge
to
o
l candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid
A
gu
i
lar
difftool: put
t
he cursor on t
h
e edit
a
ble file f
o
r Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
diff
t
o
o
l: fix documentation pr
o
b
l
ems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguilar
contrib: add 'gi
t
difftoo
l
' for
l
aunchi
n
g common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
D
avid Aguila
r
git
-
mergetool: prop
e
rly handle "git
m
erg
e
t
o
o
l -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add
a
testcase
f
or "git submodule sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David A
g
uilar
git-submodul
e
:
a
dd
"syn
c
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid
A
guila
r
git-submodu
l
e: r
e
pla
c
e duplica
t
e
d
cod
e
with a mo
d
ule_
l
i
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid
A
guilar
[PATCH] gitk: D
o
n
'
t show loca
l
changes
w
hen we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree