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
submodule sync: Update "submodule.<name>.url"
2010-08-18
David Aguilar
submo
d
ule sync
:
Up
d
ate "s
u
bmodule
.
<name>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David
Aguilar
Documenta
t
ion: Explain git-mergetool's use o
f
t
emporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Makefile: R
e
mov
e
us
a
ge
o
f depre
c
a
ted Python "has
_
ke
y
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
Ag
u
ilar
dif
f
tool: Fix '--gui' when
d
iff
.
guitool
i
s unconfigured
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Agu
i
lar
t
7
8
00-difftool
.
s
h
: Test mergetoo
l
.
prompt fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
David Agu
i
lar
d
iffto
o
l
:
Update
c
op
y
r
i
ght notices to
list each y
e
a
r
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Da
v
id
A
g
uilar
di
f
ftool: Use ev
a
l to expa
n
d '--extcmd' expressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
dif
f
tool: Add
'-x'
a
nd as an alias for '--ex
t
cmd'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
t
7800-d
i
fftool
.
sh: Sim
p
lif
y
the --extcmd test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
git
-
diff
.
txt:
L
ink to git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Agui
l
ar
di
f
ft
o
o
l
:
Allow
specifying unconfigured comma
n
ds with
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
D
a
v
id Ag
u
ilar
d
i
fft
o
ol--helper
:
Remove use of t
h
e
GIT_M
E
R
GE
_
TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id
A
guilar
d
i
f
ft
o
o
l--hel
p
er: Updat
e
c
opyright and remove distracting
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Aguilar
git-difftool:
Add '
-
-
g
ui' for
s
e
l
ecting a GUI t
o
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
t7800-difftool: S
e
t a bogu
s
tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Aguilar
h
e
l
p
:
D
o n
o
t unnecess
a
ril
y
l
ook for a repository
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submodule
.
c: Squelch a "use before assignment" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
di
f
f: generate pretty fi
l
e
na
m
e
s
i
n
p
r
e
p_temp_bl
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a
basename() comp
a
tibilit
y
func
t
ion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
A
guilar
c
o
mpat
:
add a mkstem
p
s() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Aguil
a
r
A
dd g
i
t
-replace to
.
g
itig
n
or
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
merget
o
ol
-
-
l
ib: add
support f
o
r araxis m
e
rge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Aguil
a
r
merg
e
tool-
-
li
b
:
specialize
d
iff
opti
o
ns for
emer
g
e
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Agu
i
lar
mergetool-
-
lib
:
simplify AP
I
us
a
ge by removing more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/mergetool:
refac
t
or commands to use g
i
t-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merge
t
ool
:
u
s
e $(
.
.
.
) instead of `
b
ackticks
`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguilar
bas
h
completion: add git-diffto
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Aguilar
di
f
ftool:
add support for a
d
iffto
o
l
.
prompt config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
difftool: add various git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
d
i
fftool:
m
ove 'git-difftool'
out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: a
d
d a -y shortcut
f
o
r
--no
-
prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftoo
l
: use perl
built-ins when
t
esting for msy
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: remove the backup file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
difftoo
l
: remove merge
options
f
o
r opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Dav
i
d Aguilar
everyday: use t
h
e dashless fo
r
m of git-
i
n
it
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David
A
guilar
contrib/difftool
:
use a s
e
p
a
rate conf
i
g
name
s
p
ace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Agui
l
ar
contri
b
/difftool: Don't rep
e
at merge
tool
candidates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
i
d
Aguilar
difftoo
l
:
p
ut the curs
o
r on th
e
editab
l
e
f
i
le for Vi
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
fftool: fix documentation problems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
David Agui
l
a
r
contrib: add 'git difftoo
l
' f
o
r launc
h
ing common
m
erge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
g
i
t-merge
t
ool: properly han
d
le "
g
i
t mergetool
-
- f
i
len
a
me"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
t
ests: add a testcase fo
r
"
git
submodule s
y
nc"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
D
a
vid
A
gu
i
lar
g
it-submodule: add "sync"
c
o
mma
n
d
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
David Aguilar
git-submodul
e
:
replace
d
uplica
t
ed
c
ode w
i
th a
m
odule_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
D
a
vid Ag
u
ilar
[P
A
TCH] gitk: Don't show l
o
cal changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree