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
Merge branch 'jc/stash-pop-not-popped'
2014-02-24
David
Agui
l
ar
d
ifft
o
o
l
: suppor
t
rep
o
s
itories with
.
git-files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid
Aguilar
pull: ad
d
--ff-on
l
y to the help te
x
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2014-01-16
D
avid Aguilar
pull: add pull
.
ff confi
g
ur
a
tion
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-21
David Aguilar
imap-send: e
l
iminate HMA
C
deprecat
i
on war
n
ings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
David Aguila
r
cache
.
h:
e
limi
n
ate SHA-1 depr
e
cation warnings on Mac
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-20
D
avid
A
guilar
Makefil
e
: add s
u
p
po
r
t
for App
l
e CommonCr
y
pto facility
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-11
David Aguil
a
r
Makefil
e
:
f
ix defau
l
t regex setti
n
gs on Darwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-05-09
David
A
guilar
mer
g
etools/kdiff3:
d
o not use --auto wh
e
n diffin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-04-16
Da
v
id Aguilar
h
el
p
.
c: a
d
d
a
co
m
patibility comment to
c
md_
v
ersion(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Da
v
id Aguilar
con
t
r
ib/mw-to-git/t/install-wiki
.
s
h
: use a lowercase
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David Aguilar
c
o
ntrib
/
examples/
g
it-remo
t
e
.
perl: use a lowerc
a
s
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
Dav
i
d Aguilar
tests: use a lowerc
a
se "usag
e
:
" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-25
David
Agu
i
l
a
r
git
-
svn: use
a lowerc
a
s
e "
u
sage:" str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
D
ocumentation/user-man
u
al
.
tx
t
:
u
se a lowerc
a
se "u
s
age
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
av
i
d Aguilar
te
m
plates/hooks--u
p
date
.
sam
p
le: use a lowercase "usa
g
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
guilar
con
t
rib/hooks/setgitper
m
s
.
perl: use a lowercase "usage
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d Aguilar
contr
i
b
/
examples: use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
c
o
ntrib/fast-import/im
p
ort
-
zips
.
py
:
us
e
spaces
i
n
s
tead
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
i
d Aguil
a
r
contrib/f
a
st-imp
o
rt/import
-
zips
.
py: fi
x
b
r
ok
e
n error
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
v
id Aguilar
contrib/
f
ast-import: use
a lower
c
ase "usa
g
e:"
st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
g
uilar
contrib/cr
e
de
n
t
i
a
l: u
s
e a l
o
w
ercase "usage:" s
t
ring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-cvsimport: use a lowercase
"
usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
A
guilar
git-cvsimport
:
use a lowercase
"usage
:
" st
r
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Aguilar
git
-
cvsexport
c
ommi
t
: use a lowerca
s
e "usage:
"
str
i
ng
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
D
a
vi
d
A
g
ui
l
ar
git-archimport: u
s
e
a
lo
w
ercase
"usage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David
Aguilar
g
it-mer
g
e-one-file:
use a lowercase
"
u
sage:" strin
g
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
David Ag
u
ilar
git-relink: u
s
e a lowercase "usa
g
e:
"
s
tring
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Da
v
id A
g
uilar
git-s
v
n
: use a
lowe
r
case "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-24
Dav
i
d
A
g
uilar
g
it-sh-setup:
use a
l
owerc
a
se "usage:" string
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
Dav
i
d
A
guilar
t7800: "de
f
aults"
i
s
no lo
n
ger a bui
l
t
in tool name
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-21
David Aguilar
t7800: modernize tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-20
David Aguil
a
r
t78
0
0:
update copyright notice
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-17
David A
g
uila
r
d
i
fftool:
s
i
lence uninitialized
v
a
riable w
a
rning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4merge:
f
ix pri
n
tf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-10
David
A
g
u
ila
r
difftool--helper: fix printf usage
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid Ag
u
ilar
doc: generate a list of valid merge too
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-02-03
D
avid A
g
u
i
lar
mergetool--lib: add functions for finding av
a
ilable
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
m
ergeto
o
l--l
i
b
: im
p
r
o
ve the
h
elp text in
guess
_
merge_t
o
ol()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
David Aguilar
mergetool--lib: simplif
y
command
expressions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-29
Dav
i
d Ag
u
ilar
mer
g
etools: simp
l
ify how
w
e han
d
le "vim" and "defaults"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
Da
v
id Aguilar
m
ergetool--lib: imp
r
o
ve show
_
tool_help() o
u
tput
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2013-01-28
David Aguila
r
merg
e
tools/vim: remove
r
edundant diff command
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-12-27
David Aguilar
mergetools/p4merge:
Honor $TMP
D
I
R
for the /dev
/
null
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-10-11
David
Agui
l
ar
mergetools
/
p4merge:
Handle "/dev/null"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-25
D
avid Agui
l
ar
mergetoo
l
--
l
ib: Allow custom
comma
n
ds to overrid
e
built-ins
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
Dav
i
d
Aguilar
gitk: Rename 'tagcontents' to 'cached_ta
g
con
t
ent'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-09-09
David Ag
u
ilar
gi
t
k: Teach "Reread r
e
f
erences" to reload
t
a
gs
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-08-10
David A
g
uilar
m
ergetoo
l
,difftool: Document
-
-too
l
-help consistently
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
:
Disable
-
-symlinks on c
y
gwin
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
Dav
i
d
A
guilar
difftool: Handle compare() return
i
ng -
1
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap long lin
e
s
for readability
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
i
d
Aguilar
d
iffto
o
l:
Che
c
k al
l
re
t
urn
c
od
e
s
f
rom compare()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-25
D
avid Aguilar
d
i
fftool: Handle finding merget
o
o
l
s/ i
n
a path wit
h
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
vid Aguilar
difftoo
l
: Use symlinks
w
hen
d
i
ffing
a
gainst
the w
o
rktree
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
Davi
d
Aguila
r
difftoo
l
:
C
all the temp directory "git-difftool"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
lar
d
ifftool: Move option
v
alues into
a hash
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d
A
g
uilar
difftool: El
i
mi
n
ate globa
l
variables
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
i
d Aguilar
dif
f
to
o
l: Simplify print
_
to
o
l_hel
p
()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-03-19
David Aguil
a
r
t780
0
: Test dif
f
tool passing
arguments to diff
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2012-01-23
David
Ag
u
i
lar
m
ergetool: P
r
ovide an empty file
w
hen n
e
eded
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-30
David Ag
u
ilar
Makefile: Improve compiler header
depen
d
ency chec
k
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
Davi
d
Aguila
r
mergeto
o
l
s
/meld: Use '--output' when availa
b
le
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguilar
merget
o
ol--li
b
: R
e
factor t
o
o
l
s into separate files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Agu
i
lar
mer
g
etool--li
b
: M
a
ke
style
c
on
s
istent with
g
it
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-08-19
David Aguila
r
difftool--h
e
lper: Ma
k
e
s
t
yl
e
consistent with g
i
t
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-06-02
Davi
d
Aguilar
t/
t
7
503-pre-commit-h
o
ok
.
sh: Add GIT_
P
REFIX tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
D
a
vid Aguilar
git-merget
o
ol--lib: M
a
ke vimdiff re
t
ain
t
h
e
current
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
David Aguilar
git: R
e
move ha
n
dling for GIT_PREFIX
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2011-05-26
Davi
d
Aguilar
set
u
p: Prov
i
de
G
IT_PRE
F
IX to built-
i
n
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule
s
ync: Upda
t
e "submodule
.
<na
m
e
>
.
u
rl"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-08-17
Davi
d
Aguilar
mergetool: Skip auto
r
es
o
lved paths
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-07-19
David
A
guila
r
Documentation
:
Explain git-mergetool's us
e
of temporar
y
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-29
David
A
gu
i
lar
Makef
i
le: Remove
usage of deprecated Python "
h
as_key
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
v
id Aguilar
difftool: Fix
'--gui' wh
e
n diff
.
guit
o
ol is unco
n
figured
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-23
D
avid Aguilar
t
7800-difftool
.
sh: Test merget
o
ol
.
prompt fal
l
back
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-16
Da
v
id
A
guilar
diffto
o
l: Up
d
ate cop
y
r
i
ght notices to list eac
h
ye
a
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
di
f
ftool: Use eval to expand '--extcmd' ex
p
r
essions
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
diff
t
ool: Add '-x' and as an al
i
a
s
for '--extcmd'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftoo
l
.
sh
:
Si
m
plify th
e
-
-ext
c
md test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
Dav
i
d Ag
u
ila
r
git-diff
.
txt: Link to git
-
difftoo
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguilar
difftool: Allow specifying unconfigured co
m
m
a
n
ds with
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
D
avid Aguil
a
r
difftool--h
e
lper: Remove us
e
of th
e
GIT_
M
ERGE_TOOL
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-10
David Aguila
r
difftool-
-
help
e
r: Update copyright a
n
d re
m
ove
d
i
s
t
racti
n
g
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
David Ag
u
ila
r
g
it-difftool: Add '--gui' for s
e
lect
i
ng
a GUI tool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2010-01-03
D
a
vi
d
Agu
i
lar
t78
0
0
-di
f
ftool: Set a bogus tool for use by te
s
ts
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-12-01
D
a
vid Agu
i
lar
help: Do n
o
t
u
nnecessarily look for a
r
ep
o
s
itory
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-11-21
D
avid Aguilar
s
u
bmodul
e
.
c
:
Squelch
a
"use
before assignment" warning
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
avid
A
guilar
diff:
g
enerate p
r
ett
y
filenames in prep_t
e
mp_blob()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David
A
g
u
ilar
compat: add
a
basenam
e
() compati
b
il
i
ty
f
u
nction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
D
a
v
id Ag
u
ilar
compa
t
: a
d
d a
m
kstem
p
s
(
)
compatibility functio
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-06-01
David Ag
u
i
l
ar
Add git-replace to
.
gitign
o
re
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
D
a
vid Aguilar
mergetool--lib: add support for
a
ra
x
is m
e
rg
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
David A
g
u
ilar
mergetool-
-
li
b
:
s
pecialize diff
o
ptions for em
e
rge
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-12
David Aguilar
mergetool--lib: s
i
mplify API usa
g
e by r
e
m
o
ving more
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool/
m
ergetool: refactor
c
o
mman
d
s
to use git-mergetool
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Davi
d
A
g
u
i
lar
m
e
rge
t
ool:
u
se $(
.
.
.
) instead
of `backticks`
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
Da
v
id Agui
l
a
r
bash completion: add git-difftool
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difftool:
a
dd support for
a difftool
.
pro
m
pt config
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
David Aguilar
difft
o
ol: add various
g
i
t
-d
i
f
ftool tests
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2009-04-08
D
avid Agu
i
lar
difftool
:
m
ove '
g
it-diff
t
ool' out of contrib
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next