repo.or.cz
/
git
/
jnareb-git
/
bp-gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.7.2.5
2010-08-18
David
A
gu
i
lar
submod
u
l
e sync: U
p
date "s
u
b
module
.
<
n
ame>
.
url"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David Aguil
a
r
Documentat
i
on:
Explain git-mergetool's use of te
m
p
o
r
a
ry
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David Aguilar
Makefile
:
Remove
u
sage of deprecated
Python "ha
s
_ke
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vi
d
Aguilar
difftool: Fix '--g
u
i'
w
hen diff
.
guitool is
u
nconfigur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David
A
guila
r
t780
0
-diff
t
ool
.
sh
:
T
e
st m
e
rget
o
ol
.
prompt fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
D
a
vid
A
g
u
i
l
ar
diff
t
ool: Update copyright notice
s
to list each year
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Ag
u
i
lar
difftool: Use
eval to expand '--e
x
t
cmd' e
x
press
i
ons
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agui
l
ar
di
f
f
tool: Add '-x' and as
a
n alias for '
-
-
e
x
tcmd
'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
Agu
i
lar
t7800-d
i
fftool
.
sh: Simplify
the
-
-ext
c
md t
e
st
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agu
i
lar
git-diff
.
txt: Link to git
-
difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
d
i
fft
o
ol: Allow specifying unconfigured co
m
mands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol
-
-helper: Rem
o
ve use of the
GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftoo
l
--helper:
U
pdate copyright a
n
d remove distr
a
c
t
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguilar
git-difft
o
o
l:
A
d
d '--
g
ui' for selecting a GUI too
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
Da
v
id Aguila
r
t78
0
0-difftool:
Set a bogus tool for
use
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David
A
g
u
i
lar
help: Do not unnecessa
r
ily look for a repositor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Da
v
id Aguila
r
s
ubmodule
.
c: Squel
c
h a "use before ass
i
gnment" w
a
rnin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: ge
n
erat
e
pretty fi
l
enames
i
n prep_temp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
gui
l
a
r
compa
t
: add a base
n
a
m
e() compa
t
i
b
i
l
ity function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
Dav
i
d
Ag
u
ilar
compat: add a mkstemps() compat
i
bility fu
n
c
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguilar
Add git
-
r
e
p
lac
e
to
.
gitignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
avid
A
guilar
mergetool--lib: add support for ar
a
xis merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Davi
d
A
g
uil
a
r
mergetool--lib
:
special
i
ze
d
iff options for emerge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Da
v
i
d Aguilar
mergeto
o
l--li
b
: simplify API usage
b
y
r
emoving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguilar
diffto
o
l/merget
o
ol: refactor commands to
u
se git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Ag
u
ilar
merg
e
t
o
ol:
u
se $(
.
.
.
) instead of `ba
c
kt
i
cks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
b
as
h
completion
:
ad
d
git-di
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Aguila
r
difftool: add support for a diff
t
ool
.
prompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
uilar
difft
o
ol: add
v
a
r
ious git-diff
t
ool t
e
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: move
'git-diffto
o
l'
out of cont
r
ib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
o
ol: add a -y
s
hortcut for --no-pr
o
mpt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agu
i
lar
diff
t
oo
l
: use perl built-ins when
t
esting for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
di
f
ftool: remove the b
a
ckup
f
ile
f
e
ature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: r
e
move
m
erge o
p
tions for op
e
ndiff,
tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
everyday: use the da
s
h
l
ess form of git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Agu
i
lar
c
ont
r
ib/difftoo
l
: us
e
a separate config
n
amespace
f
or
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
Davi
d
A
guila
r
contrib/dif
f
tool: Don'
t
repeat
merge to
o
l
can
d
idates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
a
v
id Ag
u
ilar
difftool: p
u
t the cursor on the ed
i
table
f
i
l
e
fo
r
Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
dif
f
t
ool: fix doc
u
mentation
p
roblems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
D
a
vid
A
guilar
contrib
:
add 'g
i
t di
f
ftool' f
o
r launchin
g
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-
m
ergetoo
l
: prop
e
rly handle "git mergetool -- filename"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
David Ag
u
ilar
tests: a
d
d
a test
c
ase for "git
s
ubmodule
s
ync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
id Aguilar
git
-
submodule
:
add "sync" comm
a
nd
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
avi
d
Aguilar
git-submodule: replace duplicate
d
code with a
m
odule_
l
ist
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David
A
guilar
[
PATCH] git
k
: Don
'
t
sho
w
l
o
cal ch
a
nges wh
e
n
we t
h
ere
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree