repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
setup.c: detect $GIT_COMMON_DIR in is_git_directory()
2010-01-15
D
a
vid A
g
uilar
diff
t
oo
l
:
Use eval
t
o expand '
-
-extc
m
d' expr
e
ssions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
difftoo
l
:
Ad
d
'-x' and
a
s
an
alias for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
t7
8
00-di
f
f
too
l
.
s
h: S
i
mp
l
ify the --extcmd te
s
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David A
g
uilar
git-
d
if
f
.
tx
t
: L
i
nk to git-d
i
f
ftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
difftool: Allow specifying
uncon
f
igured co
m
mands w
i
th
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Agui
l
ar
dif
f
tool--
h
elper: Remove
use of the
GIT_MERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
diff
t
ool--helper: Update copyr
i
g
h
t
a
n
d
remove d
i
s
t
r
acting
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
avid
Aguilar
git-difftool: Add '-
-
gui' for s
e
lecting
a
GUI
t
oo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David
A
guil
a
r
t7800-d
i
fftool: Se
t
a bogus too
l
f
or us
e
by tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
David Agui
l
a
r
help: Do not un
n
ecessarily lo
o
k
f
or a
r
eposit
o
ry
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
David Aguilar
submo
d
ule
.
c: Squ
e
lch a "use befo
r
e assignment
"
warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
diff: g
e
nerate
pr
e
tty fi
l
e
n
ames in prep_
t
emp_b
l
ob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David A
g
uil
a
r
compat: add a ba
s
ena
m
e() compatibility function
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid Ag
u
ilar
co
m
pat: add a
m
ks
t
e
mps() compatib
i
lity
f
unc
t
ion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Agui
l
ar
Add git-replace to
.
g
i
t
i
gnore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Da
v
id Aguilar
mergetool--lib: a
d
d sup
p
ort for
a
raxis
merge
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David Aguilar
mer
g
e
tool--lib: specialize diff option
s
for eme
r
ge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
Davi
d
Aguilar
mergetool--lib: simplify API usag
e
by remo
v
ing m
o
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uilar
dif
f
tool/mergetoo
l
: ref
a
ctor c
o
m
m
ands to
u
s
e git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
Agui
l
ar
mergetool: use
$(
.
.
.
) instead of `b
a
c
k
t
i
ck
s
`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vi
d
Aguilar
bash co
m
ple
t
ion: a
d
d git-
d
ifftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Agui
l
ar
diffto
o
l
:
a
d
d su
p
p
o
r
t
f
or
a
dif
f
t
o
ol
.
p
rompt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
dd va
r
iou
s
g
it
-
difftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
d
i
ff
t
ool
:
move 'git-difftool
'
out
o
f
contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguil
a
r
diff
t
ool
:
add a -y sh
o
rtcut for -
-
no-prompt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid A
g
u
ilar
d
ifftool:
use perl
bui
l
t-ins whe
n
testing for msys
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguila
r
difftool:
r
emove the backup file f
e
at
u
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool: re
m
ove
m
erge option
s
fo
r
opendiff,
tkdi
f
f
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-22
David Aguila
r
eve
r
yday
:
use the dashles
s
form of git-in
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-03-12
David Aguilar
co
n
tr
i
b/difftoo
l
: use a separate
config na
m
e
space for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-02-01
David
Aguilar
contrib/difft
o
ol: Don
'
t repeat merge tool ca
n
didates
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
D
avid A
g
u
ilar
difftool
:
put the cursor on t
h
e editable
f
ile for Vim
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-19
Da
v
id
A
guilar
difftool: fix documentat
i
on proble
m
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-01-18
Da
v
i
d
A
g
ui
l
a
r
contrib: add 'git difftool'
for launchin
g
common merge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-12-20
David Agui
l
ar
gi
t
-merget
o
ol:
p
roperly handle
"git mergetool -- filen
a
m
e
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Agu
i
l
a
r
tes
t
s: add a
testcase for "git submodule syn
c
"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
g
i
t
-
sub
m
o
d
ule: add "sync" command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
D
a
vid
A
guilar
git-submo
d
ule: replace d
u
plicate
d
code with a module_l
i
st
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-03-11
David Aguil
a
r
[
PATCH] git
k
: Don't show local
ch
a
n
g
es wh
e
n we th
e
re
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree