repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add Code Compare v2.80.4 as a merge / diff tool for Windows
2012-08-10
Sebastia
n
Schuberth
A
dd
Code Compare v2
.
80
.
4 as
a
mer
g
e / diff
tool f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-10
David Aguilar
mergetool,difftool: Do
c
ument --tool-help
consistently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftoo
l
:
D
i
sable
-
-
symlinks on cygwi
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
di
f
ftool: H
a
n
dl
e
compare
(
) returning -1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
Da
v
id Aguilar
diff
t
ool: Wr
a
p
l
ong
l
i
n
es for
r
e
adability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-25
Da
v
id Aguilar
difftoo
l
: Check all
retur
n
c
o
des from
c
ompare()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
diffto
o
l:
H
andle findi
n
g merge
t
ools/ in
a
p
a
th wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftoo
l
: Us
e
symlinks
w
hen diffing against t
h
e
w
o
r
k
t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difftoo
l
: Call
t
he
temp
d
i
r
ectory
"
git-d
i
fftool"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
o
l: Move optio
n
values
into
a
h
a
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
d
i
fftool: E
l
imin
a
t
e
g
l
obal var
i
ables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
Da
v
id Aguilar
d
ifftool:
Simp
l
if
y
print_
t
ool
_
help()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
Tim He
n
igan
difftool: only
copy
b
ack files modifie
d
during
dir
e
cto
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
J
u
nio C Hamano
Git 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Ju
n
io C Hamano
Sync w
i
th 1
.
7
.
10
.
5
commit
|
commitdiff
|
tree
2012-06-17
Junio C Hamano
Git 1
.
7
.
10
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Vi
n
c
e
n
t
van Rav
e
steijn
Do not
a
utosquash in case
o
f an
i
m
plied interac
t
ive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
J
u
n
i
o C
Hamano
Merge branch
'
j
s/maint-fast-e
x
port-mark
-
erro
r
' into
.
.
.
commit
|
commitdiff
|
tree
2012-06-15
Junio C Hamano
Merge gi
t
:
/
/githu
b
.
com/git-l
1
0n/git-po
commit
|
commitdiff
|
tree
2012-06-15
Junio C Ha
m
a
no
Mer
g
e
bra
n
ch 'as/diff-shortstat-i
g
nore-binar
y
'
commit
|
commitdiff
|
tree
2012-06-15
Alex
a
n
d
er Strasse
r
diff:
Only count lines i
n
show
_
shortstats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-15
Jonat
h
an Nieder
perl/Makefile: i
n
stall Git:
:
S
V
N::* when NO_PERL_MAKE
M
AKER
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-15
Jonathan N
i
eder
pe
r
l
/Mak
e
file
.
P
L
: warn about duplicate m
o
dule list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-13
Juni
o
C Hamano
Me
r
ge
branch 'rj/git
w
eb-test-sans-date-parser'
commit
|
commitdiff
|
tree
2012-06-13
Junio
C Hamano
Merge
b
ranch 'fc/g
i
t-compl
e
te-he
l
per-fi
x
'
commit
|
commitdiff
|
tree
2012-06-13
S
ZEDER Gábor
completion:
remove
c
r
e
dential helpe
r
s from porce
l
ain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-13
S
ZEDER Gábor
completion: put main git and gitk
c
ompleti
o
n f
u
nc
t
ions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Ram
s
a
y
J
o
n
e
s
gitwe
b
:
S
kip
'modific
a
t
ion
t
imes' tests when no date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C Hamano
Gi
t
1
.
7
.
11-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Juni
o
C
Haman
o
M
erge git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-06-12
Junio C Hamano
M
e
rge branch 'mm/api-credenti
a
ls
-
doc'
commit
|
commitdiff
|
tree
2012-06-12
J
uni
o
C Ham
a
no
Merge branch
'
jc/fmt
-
merge-msg-
p
eople'
commit
|
commitdiff
|
tree
2012-06-12
Mat
t
hieu Mo
y
api-cr
e
d
ential
.
txt:
d
ocu
m
ent that
h
e
lpers
f
i
e
ld is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C Hamano
M
erge branch 'js/maint-fast-exp
o
rt-
m
a
r
k-error'
commit
|
commitdiff
|
tree
2012-06-12
J
ohan
n
es S
c
h
i
nd
e
lin
fas
t
-
e
xport: r
e
p
ort SHA-1 inste
a
d
o
f g
i
bber
i
s
h
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-08
Junio
C
Hamano
Merge branch 'mm/api-credentials-doc'
commit
|
commitdiff
|
tree
2012-06-08
Jeff King
docs: fix cros
s
-direct
o
ry l
i
nkg
i
t
reference
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-07
J
uni
o
C Hamano
Git 1
.
7
.
11-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-07
J
u
n
i
o C
H
a
mano
Merge branch 'mm/api-credentia
l
s-doc'
commit
|
commitdiff
|
tree
2012-06-07
Junio C Ha
m
a
no
Mer
g
e branc
h
'rr/maint
-
t3510-cascade-fix'
commit
|
commitdiff
|
tree
2012-06-07
Juni
o
C Hamano
Merge branch 'jc
/
s
v
n-auth-providers-u
n
usabl
e
-at-1
.
6
.
1
2
'
commit
|
commitdiff
|
tree
2012-06-07
Junio C Haman
o
Merge b
r
a
n
ch 'cr/persistent-https'
commit
|
commitdiff
|
tree
2012-06-06
Junio
C
Hamano
fmt-
m
erge-msg: make
a
ttribution into comme
n
t li
n
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-05
Junio C Hamano
M
e
rge git://
g
ithub
.
c
o
m
/
git-l10n
/
git-po
commit
|
commitdiff
|
tree
2012-06-04
Ra
m
kumar Ramachandra
t3510 (cherry-pic
k
-sequen
c
e): a
d
d
mis
s
i
n
g '&&'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Matthieu
M
oy
api
-
credent
i
als
.
t
xt: add "see also" s
e
cti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
M
a
t
t
hieu Moy
api-cre
d
ent
i
als
.
txt: mention
cred
e
nt
i
al
.
helper explicitly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
M
at
t
hi
e
u
Moy
api-cr
e
dentials
.
txt: sho
w
the big picture first
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Ju
n
io C Hamano
doc: fix
x
r
ef link
f
rom api docs to
manual pages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Ju
n
io C Hamano
g
i
t-svn: p
l
atform auth
p
r
oviders a
r
e working only on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C
H
am
a
no
G
it 1
.
7
.
11
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Ju
n
io C Hamano
Sync with 1
.
7
.
10
.
4
commit
|
commitdiff
|
tree
2012-06-03
Ju
n
i
o C Hamano
Gi
t
1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C Haman
o
Merge
b
ranch 'ef/
m
a
int-reb
a
se-error-mes
s
age' into maint
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
Ham
a
no
U
pdat
e
d
raft release
n
o
t
e
s
to 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
Junio C
Hamano
Mer
g
e branc
h
'ef/main
t
-rebase-error-
m
essage'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merg
e
branch
'nh/empty-reba
s
e'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Mer
g
e
b
ranch 'vr/rebase-autos
q
ua
s
h-does-not-imply-i'
commit
|
commitdiff
|
tree
2012-06-01
Junio C
Ha
m
ano
Me
r
ge branch 'mm/levens
t
ein-p
e
nali
z
e-deletio
n
-l
e
ss'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merge branch 'jl/submodu
l
e-report-n
e
w-path-once'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Sync with mai
n
t
commit
|
commitdiff
|
tree
2012-06-01
Junio C
H
amano
Sta
r
t preparin
g
fo
r
1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
Hamano
Merg
e
branch 'ef/htt
p
-o-depends-on-gvf' into maint
commit
|
commitdiff
|
tree
2012-06-01
Ju
n
io
C H
a
m
ano
M
erge git://
g
i
t
hub
.
com
/
git-
l
10n/git-
p
o
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merge bra
n
ch '
r
s/ma
i
nt-grep-F' into ma
i
nt
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ha
m
ano
Mer
g
e branch '
j
k/ident-spli
t
-fix'
i
nto maint
commit
|
commitdiff
|
tree
2012-06-01
J
unio
C
Ha
m
a
no
M
e
rge branch
'jk/pre
t
ty-commit-header-incomplete-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merge br
a
nch 'jk
/
format-person-part-buffer-limit
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C H
a
mano
Mer
g
e branch 'a
p
/ch
e
ckout-no-p
r
o
g
ress-for-n
o
n
-
t
t
y'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
Hamano
Merg
e
branch 'm
a
int' of git://gith
u
b
.
c
om
/
g
i
t-l10n/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Jiang Xin
i18n: ap
p
ly: split to fix a partial i18
n
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-31
E
r
i
k
F
ay
e
-Lu
n
d
Makefil
e
:
a
dd missing GIT
-
V
E
RSION-FILE d
e
pe
n
dency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Colby Ranger
Add p
e
rsistent-http
s
to contr
i
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Erik
F
a
y
e-Lund
rebase: re
p
ort invalid commit
c
o
r
r
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Jeff Kin
g
INSTALL: up
d
ate
a
s
c
i
idoc recommenda
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Junio
C Hama
n
o
c
herr
y
-pick: re
g
res
s
ion
f
ix for empty c
o
mm
i
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
J
e
n
s Lehmann
submodules: print "regi
s
tered for
path" message only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Junio C H
a
ma
n
o
Merge
git://bogomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2012-05-29
Jeff King
t
5701:
moder
n
ize s
t
yle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Juni
o
C Ha
m
an
o
M
e
rg
e
bra
n
ch 'va/
g
it-p4-test'
commit
|
commitdiff
|
tree
2012-05-29
Junio
C
H
amano
Merge branch 'jk/ident-gecos-strbuf'
commit
|
commitdiff
|
tree
2012-05-29
Ju
n
io C Hamano
Merge b
r
a
nch 'jk/f
e
tch-pack-remove-dups-optim
'
commit
|
commitdiff
|
tree
2012-05-29
Junio C Hamano
M
erge
branch
'
rs/ref
s
-string-s
l
i
c
e'
By René Scharfe (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-29
Junio
C
Haman
o
Merge bran
c
h 'mh/fetch
-
pa
c
k
-
co
n
stness'
commit
|
commitdiff
|
tree
2012-05-29
J
unio C Hamano
Me
r
ge branch
'mh/re
f
-a
p
i
-
l
azy-loose'
commit
|
commitdiff
|
tree
2012-05-29
J
unio
C
H
aman
o
Merge
b
ran
c
h 'ng/pack-object
s
-clea
n
up'
commit
|
commitdiff
|
tree
2012-05-29
Vinc
e
nt v
a
n Raveste
i
jn
Do not autosquash i
n
case of
an implie
d
in
t
era
c
t
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Matthieu Moy
R
e
duce cost
of deletio
n
in levens
t
ein
d
is
t
ance (4
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
V
itor Antunes
git-p4
:
Cle
a
n up branch
test cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Vitor Antunes
g
it-
p
4: Verify detection of "empty" branch creat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Vi
t
or Antunes
git-p4: Test chang
e
lists
touching
t
w
o
bran
c
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Junio C
H
amano
Git 1
.
7
.
11-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
J
u
nio C Hamano
Merge bra
n
ch
'sp/sh-windows-
p
wd'
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
Merge
bran
c
h 'mh
/
test-
k
eep-prove-
c
ache'
commit
|
commitdiff
|
tree
2012-05-25
Juni
o
C Hamano
Mer
g
e
bra
n
ch 'rs
/
dir-strbuf-read-recur
s
i
v
e-fix'
commit
|
commitdiff
|
tree
2012-05-25
J
u
ni
o
C
Hamano
M
e
rge bra
n
ch 'fc/git-c
o
m
plete-he
l
per
-
fix'
commit
|
commitdiff
|
tree
2012-05-25
Juni
o
C Ham
a
no
Merge
branch 'ap/c
h
e
c
kout-no-progress-for-
n
on-tty'
commit
|
commitdiff
|
tree
2012-05-25
J
u
nio C
Ham
a
no
M
erge bran
c
h 'j
k
/form
a
t-
p
erso
n
-part-buffe
r
-limit'
commit
|
commitdiff
|
tree
2012-05-25
Jun
i
o C Ha
m
a
n
o
Merge branch 'jk/
p
retty-commit-
h
eader-i
n
complete-l
i
ne'
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hama
n
o
Merge branch
'
j
k/ide
n
t-s
p
lit-fix'
commit
|
commitdiff
|
tree
next