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
difftool: Allow specifying unconfigured commands with --extcmd
2010-01-10
David Aguilar
difft
o
o
l:
A
llow specifying unconfi
g
ured commands
w
ith
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
David
Aguilar
difft
o
ol--helper: Remov
e
use o
f
the GI
T
_
MERGE_TOOL
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Aguilar
dif
f
tool--he
l
per: Upd
a
te copyright a
n
d remove distractin
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ilar
git-dif
f
tool: Add '--gui' f
o
r selec
t
ing a GUI to
o
l
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-03
David
Aguilar
t7800-
d
ifftool:
S
et a bogu
s
tool for use by tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-12-01
D
avid Agu
i
l
ar
help: Do not unnecessarily look
for a repositor
y
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-21
Dav
i
d Aguilar
submodule
.
c:
S
q
u
elc
h
a "use before
assignm
e
nt" warning
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguil
a
r
diff: gener
a
te pretty
filen
a
mes in prep_temp_
b
l
o
b()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
Davi
d
A
g
u
il
a
r
compat
:
add a basename() compati
b
ility
f
unction
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David
Ag
u
ilar
compat: add a mkstemps()
c
ompatibilit
y
function
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-06-01
David Aguilar
Add git-replace to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-24
David
Aguilar
mergetool--lib: add support for araxis merge
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-05-09
Dav
i
d Aguilar
mergetool--l
i
b: specia
l
ize diff o
p
tions f
o
r em
e
r
ge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-12
D
a
vi
d
Aguilar
mergetool--lib: simplify API usag
e
by r
e
mov
i
ng more
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David A
g
uila
r
difftool/m
e
rgetoo
l
: refa
c
tor commands to use git-merg
e
t
o
ol
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
Aguilar
m
e
r
getool
:
use $(
.
.
.
) instead of `backticks`
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
vid Aguilar
bash
c
om
p
le
t
io
n
: add git-difftool
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id Aguilar
difftool: add supp
o
rt
f
or a dif
f
tool
.
prom
p
t config
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id A
g
uilar
di
f
ftool: add va
r
io
u
s git-difftool tests
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Dav
i
d Aguila
r
difftool: move 'g
i
t-d
i
fftool' out of contrib
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
diff
t
ool: ad
d
a -y shortc
u
t for --
n
o-prompt
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
David
A
guilar
difftool: use
p
e
r
l
built-ins when testing for
msys
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
Agui
l
ar
difft
o
o
l
: re
m
o
ve the
b
ac
k
up file feature
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-04-08
D
a
v
id
A
g
uilar
difftool: remov
e
merge opt
i
ons for opendiff, tkdiff
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-22
David Agu
i
lar
everyday: use t
h
e
d
a
shless form of git-init
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-03-12
D
avid Ag
u
ilar
c
ontrib/
d
ifftool:
u
s
e a separa
t
e config name
s
pace
f
or
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-02-01
Dav
i
d Aguilar
contrib/di
f
f
tool: Don't repeat merge tool cand
i
dates
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
David Aguilar
difftool: put
t
he cur
s
or on the editable file for Vim
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-19
Davi
d
Aguilar
difftool: fix
d
ocumentat
i
on
p
rob
l
ems
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2009-01-18
Dav
i
d Aguilar
contrib: add 'git diff
t
ool' f
o
r launch
i
ng common merge
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguilar
git-mergetool: prop
e
rly
h
andl
e
"git
merg
e
to
o
l -- filename"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-03
D
a
vid Ag
u
i
l
ar
tests: add a testcase for "git submodule sync"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-26
Da
v
i
d
Aguila
r
git-submodule: a
d
d
"s
y
nc" command
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-23
Davi
d
A
g
uilar
git
-
submo
d
ule
:
replace
duplicated code
wit
h
a module_lis
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-03-11
Davi
d
Aguilar
[PATCH]
g
itk
:
Don't show local changes when we there
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree