repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-mergetool--lib: Make vimdiff retain the current directory
2011-05-26
David
A
g
uilar
git
-
mergetool--lib: M
a
ke vimdiff retain the current
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
g
it: Remove ha
n
dling fo
r
GIT_PR
E
FIX
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2011-05-26
D
av
i
d Aguilar
s
etup: Provid
e
GIT_PRE
F
IX to b
u
il
t
-
ins
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Davi
d
Aguilar
s
u
bmodule sync: Update "submodule
.
<name
>
.
url"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
merg
e
t
ool:
Skip autoresolved p
a
ths
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
Documentation
:
Explain
g
it-mergetool's use
o
f
temporary
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-29
David A
g
uilar
Ma
k
efile: Re
m
ove usage of depreca
t
ed Python "has_key
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-28
David
A
guilar
difftool: Fix '--gui' when diff
.
guitool is unc
o
nfig
u
red
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-d
i
fftoo
l
.
sh
:
Test mergeto
o
l
.
pro
m
p
t
fallback
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Aguilar
difftool: Updat
e
copyright
n
o
tices to l
i
st
e
ach year
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Aguilar
difftool:
U
se eval to expand '--extcm
d
' e
x
pressions
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid A
g
u
ilar
difft
o
ol:
Add '-x'
a
nd as an alias for '--ext
c
md'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
t78
0
0-di
f
ftool
.
sh: Simp
l
ify the
-
-ex
t
c
md test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
gi
t
-diff
.
txt: Link to git
-
difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Aguilar
difft
o
ol: Allow
s
p
ecifying unconfigured co
m
mands wi
t
h
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Da
v
id Agui
l
ar
diff
t
o
ol--helper:
R
e
m
ove
u
se of the GIT_MER
G
E
_
TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diffto
o
l--helper: Up
d
ate copyright an
d
remove distracti
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Agu
i
l
a
r
git-difft
o
ol: A
d
d
'--gui' f
o
r sel
e
cting a GUI tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
Dav
i
d
Aguilar
t7800
-
diff
t
oo
l
: Se
t
a
b
ogus
t
o
ol
f
or use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
a
r
help: Do not unnece
s
sa
r
il
y
look
for a rep
o
sito
r
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
D
av
i
d A
g
uilar
submod
u
le
.
c: Sque
l
ch a "use bef
o
re ass
i
gn
m
ent" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff:
g
enerate pretty filen
a
mes in p
r
ep
_
tem
p
_blob()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id Agu
i
lar
compa
t
: add a bas
e
n
a
me(
)
compati
b
i
lity fun
c
tion
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat: add
a mkstemp
s
() compatibility function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
Aguilar
A
dd git-repl
a
ce to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
A
guilar
me
r
g
e
tool
-
-lib: add
s
upport for
a
r
a
xis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
David Agui
l
ar
mergetool--lib: speciali
z
e diff option
s
for emerge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vid Aguilar
merge
t
oo
l
--lib:
s
implify API us
a
ge by removing
m
ore
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
difftool/mergetool: r
e
factor commands to us
e
git-mergetool
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
me
r
ge
t
o
o
l: use $(
.
.
.
) instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
bash comp
l
e
t
ion:
add git-dif
f
tool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
difftool: add support for a difftoo
l
.
prom
p
t config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Ag
u
il
a
r
difft
o
ol: add various
g
it
-
difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
di
f
ftool: move
'git-diffto
o
l' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Agui
l
ar
difftoo
l
: add a -
y
shortcut for --
n
o-pro
m
pt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
u
se perl built-
i
ns when te
s
t
i
n
g f
o
r
m
s
y
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uila
r
d
i
fft
o
ol: remove the
back
u
p f
i
le fe
a
t
u
re
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
difft
o
ol: remove
merg
e
options for opendi
f
f, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
id Aguil
a
r
e
ve
r
yday: use th
e
dashle
s
s
form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contri
b
/diff
t
ool:
u
se a sep
a
r
a
t
e config n
a
m
espace for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contr
i
b
/
difftool:
D
on't repeat merge tool candi
d
ates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
i
d
Aguila
r
difftool: put the cursor on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
d
i
fftool: f
i
x docum
e
ntation p
r
o
b
lems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Davi
d
Aguila
r
contrib: add
'git di
f
ftool' for
launching common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
Da
v
id
A
guilar
git-mergetool: p
r
operly
handle "g
i
t
mer
g
et
o
ol -- filename
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
te
s
ts:
add a testcase f
o
r
"git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
git-submodule: add
"
s
y
nc" co
m
mand
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Aguilar
g
i
t-
s
ubmodule: repla
c
e duplica
t
ed code with a
m
odule_list
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[
PATCH] gitk: Don't
s
how
local
changes
when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree