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
rebase -i: add exec command to launch a shell command
2010-07-19
D
a
v
id Agui
l
ar
D
o
cumentation: Explai
n
git-merge
t
oo
l
's use of temp
o
rary
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
Davi
d
Agu
i
lar
Makefile
:
Remo
v
e
usage
o
f de
p
recated Pyt
h
on
"
ha
s
_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vid Ag
u
ilar
di
f
ftool: Fix '--
g
ui' w
h
en diff
.
guitool
is unconfigur
e
d
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
David Aguilar
t7800-di
f
ftool
.
sh: Test mer
g
etool
.
pro
m
p
t
fallback
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
David
Aguilar
dif
f
tool: Update copyright n
o
tices to list each
y
e
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguil
a
r
difftool: Use eval to
e
xpand '--ex
t
cm
d
' expression
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool: Add '
-
x'
and as an a
l
i
a
s
for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David
Aguilar
t7800-
d
ifftool
.
sh: Simplify the --e
x
tcmd t
e
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
a
vid Aguilar
git
-
diff
.
txt: Li
n
k t
o
gi
t
-dif
f
tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Davi
d
Aguilar
difft
o
ol: Allow specif
y
i
n
g unconfigured
c
ommands with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difft
o
ol--helper: R
e
move use of the GIT_M
E
RGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Ag
u
ilar
difft
o
ol--h
e
l
p
er:
U
p
d
a
t
e
copyrigh
t
a
nd
remove dis
t
ract
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Aguil
a
r
git
-
d
ifftool:
A
dd '--gui
'
for sel
e
cting a
GUI t
o
ol
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
g
u
i
lar
t7800-difftool: S
e
t
a
bogus too
l
for
u
se
b
y tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
Da
v
id Agui
l
ar
help:
D
o not unnecessa
r
ily look f
o
r
a
repositor
y
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
Davi
d
Aguilar
sub
m
odule
.
c: Squelch a "use bef
o
re assignme
n
t
" warn
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
di
f
f
:
generate p
r
etty fi
l
e
n
ames in pr
e
p_temp_blob(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avi
d
Aguilar
c
o
mpat
:
a
dd a
bas
e
name()
c
ompatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
compat
:
ad
d
a mkst
e
mps() compatibil
i
ty f
u
ncti
o
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
Aguil
a
r
Add git-replace to
.
g
itignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
David Aguilar
mergetool--li
b
: add
support for araxis m
e
r
g
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David
A
guilar
m
ergetool--lib:
spec
i
alize diff optio
n
s for e
m
e
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--li
b
: simplify API us
a
ge by r
e
m
oving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
difftool/me
r
get
o
ol: refactor
co
m
mands to use git-merget
o
ol
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
merge
t
ool: use $(
.
.
.
) ins
t
ead of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
i
d Aguilar
bash comp
l
etion: add git-
d
iff
t
oo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguilar
diff
t
ool: add suppo
r
t
for
a difftool
.
p
r
o
mpt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Agui
l
ar
difftool: add various g
i
t-
d
ifft
o
ol tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
difftoo
l
: move
'
git-
d
i
f
ft
o
ol
'
o
ut o
f
c
o
ntrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avi
d
Aguil
a
r
di
f
ftool: add a -y
s
ho
r
t
cut for --
n
o-pro
m
p
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
di
f
ft
o
o
l: us
e
p
e
r
l
built-ins when testing for
msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agu
i
lar
d
i
f
ft
o
ol:
rem
o
ve the b
a
ckup fil
e
feature
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diffto
o
l
:
remov
e
m
erge options for ope
n
di
f
f, tkdiff
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Ag
u
ilar
everyday:
u
s
e the da
s
hless for
m
o
f
git-init
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David A
g
uilar
contrib/difftool: use a sep
a
rat
e
config namespace
for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David Ag
u
ilar
cont
r
i
b
/difftool: Don't repeat
m
e
rge
tool
candidates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
David Aguila
r
difftool: put th
e
cursor
o
n the edita
b
le fi
l
e for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id
A
g
uila
r
difftool: fix
d
ocumentation problems
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
David
A
g
u
ila
r
contrib: add 'git difftool' for launching
c
om
m
on mer
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d Agu
i
la
r
git-m
e
r
g
e
t
ool: pr
o
perly han
d
l
e
"git mergetool -- file
n
a
m
e"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
Davi
d
A
g
uilar
tests
:
add
a
testcase
f
or "git submo
d
ule
s
ync"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
D
avid
Aguilar
git-submodule: ad
d
"sync"
command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Dav
i
d
A
g
uilar
git-subm
o
dule: replace duplicated code with a module_
l
is
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Agui
l
a
r
[PATCH] git
k
: Don't show
l
ocal changes when
we ther
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree