repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6050: check pushing something based on a replaced commit
2009-06-01
Dav
i
d A
g
uilar
Add git-rep
l
a
ce t
o
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
D
a
vid
A
g
u
ilar
mergetool--l
i
b: special
i
ze diff
o
p
tio
n
s f
o
r
e
merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib:
simplify API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftool/mergetool: r
e
f
actor comm
a
nds to use g
i
t-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d
A
guilar
mergetool: use $(
.
.
.
)
instead of `backticks
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
bash
c
ompletion: add gi
t
-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool: a
d
d
s
upport for a
difftoo
l
.
pr
o
mpt
config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool
:
add various
g
it-difftoo
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
d
ifftool: move 'git
-
difftool' o
u
t of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftoo
l
: a
d
d a -y
s
hortc
u
t for --
n
o-prom
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool: use
perl built-ins when testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
difftool:
remove the
backup file f
e
atu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool
:
remove
m
erge
o
ptions for
o
pendiff, tk
d
iff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
D
avid Aguilar
everyday: us
e
the dashless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
contri
b
/difftool
:
use a separa
t
e confi
g
namespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Aguilar
contrib/difftool: Don't
repeat
m
erge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
t
o
ol: put the
cursor on the ed
i
table file fo
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid A
g
uilar
d
i
f
ftool: fix documentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
id Aguilar
contrib:
a
d
d
'git difftool' for launching
c
ommon merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguil
a
r
gi
t
-
mergetool: prop
e
rly handl
e
"git mergetool -- filen
a
me"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David
A
guilar
tests:
add a testcase
for
"
git
submodu
l
e sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id A
g
uilar
g
i
t
-
su
b
m
o
d
ule:
a
dd
"
s
ync" c
o
mma
n
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
v
id
A
guilar
g
it-s
u
b
m
odule: r
e
place dup
l
icated code
with a m
o
dule_li
s
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguilar
[PATCH] gitk: Don't
show local changes when we there
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
