repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
p4merge: fix printf usage
2013-02-10
David Agu
i
lar
p4
m
erge
:
fix printf
u
sage
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/
p
4mer
g
e: Honor $TMPDIR
for the /dev/null
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-10-11
David
Aguilar
mergetools/p4merge: Handle
"/
d
ev/null"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-25
David Aguilar
merget
o
ol--
l
ib:
A
ll
o
w c
u
s
t
om commands to o
v
err
i
de built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David Aguilar
git
k
: Rename 'tagcontents'
to 'cached_tagcontent'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-09-09
David A
g
u
ilar
g
itk: Te
a
ch
"
Reread references" to
r
eload tags
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-08-10
D
a
vid
Aguilar
mergetoo
l
,
d
ifftool: Docum
e
n
t
--tool-
h
e
lp cons
i
sten
t
ly
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool:
D
isable -
-
sym
l
inks
on cygwin
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David A
g
uil
a
r
difftool: Handle compare()
returning
-
1
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-26
David
A
guilar
d
ifftool: Wrap long lines for readability
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
David
A
guilar
difftool: Check all return
c
odes from
c
o
mpare()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-25
Davi
d
Aguilar
d
i
fftool: Hand
l
e f
i
nding
me
r
getools
/
i
n a path
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguilar
difftool: U
s
e sym
l
inks when diffing agai
n
s
t the worktree
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftool: Call
the te
m
p
d
irectory "git-d
i
fftool"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
d
i
fftool: Move option v
a
lues i
n
to a has
h
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David A
g
uilar
d
i
ffto
o
l: Elim
i
nate global variables
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-07-23
David
Aguil
a
r
difftool: Simplify print_tool_h
e
lp()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-03-19
David Agu
i
lar
t7800: Test di
f
ftool passin
g
a
r
guments to diff
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2012-01-23
David
Ag
u
i
l
ar
mergetool
:
P
rovide
an empty
f
ile
w
hen
needed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-30
D
avid Aguilar
Mak
e
file: Im
p
rove compiler
h
eade
r
dependency check
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Ag
u
il
a
r
mergetools/meld:
U
se '--
o
utput' w
h
en available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
mergetool--lib
:
Re
f
actor to
o
ls
i
nto separ
a
te files
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
D
a
vid Aguilar
merge
t
ool--lib:
M
a
k
e st
y
le consi
s
te
n
t with
g
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-19
David Aguil
a
r
difftool--helper: Make style cons
i
s
t
ent with git
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-06-02
David Aguilar
t/t7503-
p
re-co
m
mit-hook
.
sh: Add GIT_P
R
EFIX test
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
git-mergeto
o
l--lib: Make vi
m
d
i
ff retain
t
he c
u
rrent
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
avid Agu
i
lar
git: Remo
v
e
handling for GIT_PREF
I
X
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
Dav
i
d Aguilar
setup:
Prov
i
de
GIT_PREF
I
X to built-ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
Aguilar
submodule
s
ync: Update "submod
u
le
.
<name>
.
u
rl
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
Da
v
id Aguilar
mergetoo
l
:
S
kip autoresolved
p
aths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Aguilar
D
o
cume
n
t
a
tion: Explain git-m
e
rgetool's us
e
o
f
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David Agui
l
a
r
Make
f
i
le: Remove
usage
o
f deprecate
d
P
ytho
n
"
h
as_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Ag
u
ilar
difftool: Fix '--gui' whe
n
diff
.
guitool is u
n
configu
r
ed
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
Dav
i
d Aguil
a
r
t7800-difftool
.
sh: Test mergetool
.
pro
m
pt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David
A
g
uilar
difft
o
ol
:
Update copyright notices to list
e
ach
y
e
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
dif
f
t
ool: Use
eval
to expand '--extcmd
'
e
xpressio
n
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
d
ifftool: Add '
-
x' and as an
alias
for '-
-
ex
t
cmd
'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Agu
i
lar
t7800-dif
f
t
ool
.
sh: Simpli
f
y the --e
x
tcmd
t
est
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Agui
l
ar
gi
t
-di
f
f
.
tx
t
: Link to git-di
f
ftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Al
l
o
w
spec
i
fying u
n
configured co
m
mand
s
with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Ag
u
ilar
d
i
fftool-
-
h
elper:
R
emove use
o
f the GIT_ME
R
G
E
_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool--helper: Update copyright and
r
emove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Davi
d
Aguilar
git-difftool: Add '--gui' for sel
e
cting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
t7800-di
f
ftool: Set a
b
ogus too
l
for
u
se b
y
tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
help
:
D
o not unnecessarily
l
ook
f
or a re
p
o
s
itory
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Agu
i
lar
submodu
l
e
.
c: Squelc
h
a "use before assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
dif
f
: generat
e
pr
e
tty filenames in pr
e
p_
t
emp_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguilar
compat
:
a
dd a b
a
sename() co
m
pat
i
b
i
lity funct
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Aguilar
comp
a
t
:
add a mkst
e
m
ps() compati
b
i
lity f
u
nction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-replace to
.
g
i
tign
o
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
D
avid Aguilar
m
erget
o
ol--lib: add sup
p
ort for ara
x
is me
r
ge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David
Aguilar
merge
t
ool-
-
lib:
s
peciali
z
e
diff options for emerg
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
David A
g
uilar
me
r
ge
t
ool--l
i
b
:
simplify
AP
I
usa
g
e by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
difftool/
m
ergetool: refactor commands to use git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
m
ergetool: use $(
.
.
.
) instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguil
a
r
b
as
h
completion: add
git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guil
a
r
difftool: add su
p
p
o
r
t
for a difftoo
l
.
prompt conf
i
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: a
d
d various git-di
f
f
tool tes
t
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
i
fftool: move
'git-difftool' 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
s
hortcut for
-
-no-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Ag
u
ilar
diff
t
oo
l
: use pe
r
l built-i
n
s
w
hen testing for msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
dif
f
tool: remove the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: re
m
ove merge optio
n
s for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
everyday
:
use the dashless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
Dav
i
d Aguil
a
r
contrib
/
difftool: use a se
p
ara
t
e conf
i
g namespace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Ag
u
ilar
contr
i
b/diff
t
ool: Don't
repeat merge tool
candidate
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put the cu
r
so
r
on the
editable fi
l
e for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
d
ifftool:
fix documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
D
av
i
d A
g
uilar
contrib: add 'git difftool' for laun
c
hi
n
g common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
git-mergetool: p
r
operly handle "git
m
e
rgetool -
-
fi
l
ename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
tests: add a testcase for "git s
u
bm
o
dule
s
y
nc"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
David Aguilar
git-subm
o
dule: add "sync" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
gi
t
-su
b
modu
l
e: replac
e
duplicated c
o
de with a module_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Aguilar
[
P
ATCH] gitk: Don't
s
how loc
a
l changes
w
h
en we t
h
ere
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree