repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.6.5' into maint
2009-12-01
D
a
vi
d
A
gui
l
a
r
help
:
D
o
not unnecessa
r
ily
l
o
ok for a
r
epository
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguil
a
r
submodule
.
c:
Squelch a "use
b
efore as
s
ignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
d
i
ff
:
generat
e
pretty f
i
lenames in prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Da
v
i
d
A
g
uil
a
r
compat: a
d
d
a basen
a
me() compatibility
f
unction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d Agui
l
a
r
compat:
a
dd a mk
s
temps() compatibili
t
y
function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
Add
git-replace to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mer
g
etool--lib: add support for ara
x
is
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mergetool
-
-lib: special
i
z
e diff opti
o
ns for
e
m
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Dav
i
d A
g
uilar
mer
g
etool--lib: s
i
mplify API usage b
y
re
m
oving m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
a
r
difftool/mergetool: refacto
r
co
m
m
ands to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
mergetool:
u
se
$
(
.
.
.
)
instead of `ba
c
kticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
u
ilar
bash completion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: add support
for a diff
t
ool
.
prompt co
n
fig
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
l
ar
difftool: add
v
ari
o
us
g
it-difftoo
l
tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftoo
l
: move '
g
it-diffto
o
l' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
d
ifftool: add a -y sh
o
rtcut f
o
r
-
-no-pro
m
pt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
difft
o
ol: use
p
erl
buil
t
-ins
w
he
n
tes
t
ing
f
or ms
y
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguil
a
r
diffto
o
l: re
m
ove the backup file fe
a
t
u
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
d
i
f
ftool: remov
e
merge
opt
i
ons for o
p
endiff, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
Da
v
i
d
Aguilar
everyday:
u
se the dashless
fo
r
m of
g
i
t-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
D
avid
Agu
i
lar
co
n
trib/di
f
f
tool: us
e
a
s
eparate config
n
amespace for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
Agui
l
ar
contrib/diff
t
ool
:
Don't re
p
eat merge tool candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David A
g
uilar
d
ifftool: put the cursor on the editable file for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id Aguil
a
r
dif
f
to
o
l:
f
ix documentatio
n
problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
av
i
d
A
guilar
contrib: add 'git difft
o
ol' for launching comm
o
n merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: properly
h
and
l
e "git mergetool --
f
ilename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Aguilar
test
s
:
add a
t
estcase for "git su
b
mod
u
le sync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Agu
i
lar
git-submodule:
a
dd "sync
"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
David Ag
u
ilar
git-submodule: repl
a
ce
d
u
plicated co
d
e w
i
th a m
o
d
u
l
e_list
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguila
r
[PA
T
C
H] gitk: D
o
n'
t
show lo
c
al changes when we
t
he
r
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree