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
Merge branch 'sb/maint-octopus' into maint-1.6.5
2009-12-01
D
a
vid A
g
uilar
help: Do not un
n
e
ces
s
arily look for a repos
i
tory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff
:
gener
a
te p
r
e
tty
f
ile
n
a
mes in prep_t
e
mp_bl
o
b()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
id
A
guilar
comp
a
t: add a
b
asename() compatibility fu
n
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
ilar
compat: add a mk
s
t
emps()
compati
b
ility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguila
r
Add git-replace to
.
gitig
n
ore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id A
g
u
ila
r
mergetool--lib: add support for araxis merg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguila
r
mergetool--lib: specialize diff o
p
tions for
e
m
erge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d Ag
u
ilar
merge
t
ool--lib:
simplify API usage by removing more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
d
i
f
f
tool/merget
o
o
l: refactor
comm
a
n
ds to
use
g
it
-
mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
mergetool: u
s
e $(
.
.
.
) instead of
`
backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
bash comp
l
etio
n
: add g
i
t-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: add suppor
t
for a d
i
fftoo
l
.
p
r
omp
t
config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difft
o
ol: a
d
d var
i
o
us gi
t
-difftoo
l
test
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Aguilar
difftool: move
'g
i
t-
d
i
ff
t
ool'
o
ut of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
d
ifftool:
a
d
d
a
-y shortcut fo
r
--no
-
p
r
ompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
gu
i
lar
difftool:
us
e
perl buil
t
-ins when test
i
ng for
m
sys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
i
d Aguilar
difftool: remo
v
e
the b
a
ckup f
i
le featu
r
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
g
uila
r
dif
f
to
o
l: remove
me
r
g
e
o
p
tion
s
fo
r
opendiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguilar
e
v
eryd
a
y
: u
s
e
t
he d
a
shless form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
Da
v
id A
g
ui
l
ar
cont
r
ib/di
f
ftool: us
e
a sepa
r
a
t
e config
namespace
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Agu
i
la
r
cont
r
i
b
/
d
ifftool
:
Don'
t
repeat me
r
ge to
o
l candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difft
o
ol: 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
dif
f
too
l
:
fix documentat
i
on problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid Agu
i
lar
contr
i
b: a
d
d
'g
i
t diffto
o
l' fo
r
launching common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguil
a
r
git-merg
e
tool: properly handl
e
"gi
t
mergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Agui
l
a
r
tests: ad
d
a testc
a
se for
"g
i
t subm
o
dule s
y
nc"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
gi
t
-sub
m
odule: ad
d
"sync
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Agu
i
lar
g
it-s
u
bmodule: re
p
lace
duplicated code wi
t
h a
m
odule
_
l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguila
r
[PATCH] g
i
tk: Don't show local change
s
when we ther
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree