repo.or.cz
/
git
/
gitweb.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
Sebastian Sc
h
uberth
Ad
d
Cod
e
Compare v2
.
80
.
4 as
a
merge /
diff
tool for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-08-10
David
A
g
u
ilar
mergetool,di
f
ftool: D
o
cument --tool-hel
p
consistentl
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
D
a
v
i
d Aguilar
difftool: Disa
b
le --symlinks on cyg
w
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
D
avid A
g
uilar
difftool: Ha
n
dle compare
(
) returni
n
g
-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-26
David Aguilar
difftool: Wrap long l
i
nes
fo
r
readability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool
:
Check
all return codes f
r
om
c
ompare()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-25
David Aguilar
difftool: H
a
ndl
e
f
i
nding mergetools/ in a
p
ath w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
difft
o
ol: Use symlinks when diffing against the worktree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
D
avid Agui
l
a
r
diffto
o
l: C
a
ll
the
te
m
p directory "git-
d
if
f
t
ool"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David Agu
i
la
r
d
i
f
f
tool:
Move option va
l
ues i
n
t
o
a
hash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
D
a
v
id Aguilar
di
f
f
too
l
: El
i
min
a
t
e global v
a
riables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-23
David Aguilar
dif
f
tool: Simplify print_tool_help()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
T
i
m Heniga
n
d
i
fftoo
l
: only
copy
b
ack files modified dur
i
ng di
r
ector
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Junio
C
Hamano
Git 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Jun
i
o C Haman
o
Sync with 1
.
7
.
10
.
5
commit
|
commitdiff
|
tree
2012-06-17
J
u
n
io C Haman
o
Git 1
.
7
.
1
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
Vincent van Ravesteijn
Do not aut
o
squash in
cas
e
of an implied interactive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-17
J
u
nio C Ham
a
no
Merge bra
n
ch 'js/mai
n
t-fast-exp
o
rt-mark-e
r
r
or'
into
.
.
.
commit
|
commitdiff
|
tree
2012-06-15
Junio C Ham
a
no
Merge git
:
//github
.
c
o
m
/git-l10n/git
-
po
commit
|
commitdiff
|
tree
2012-06-15
Junio C Hamano
Merge branch 'as/diff-shortstat-i
g
nore-binary'
commit
|
commitdiff
|
tree
2012-06-15
Al
e
xander
Strasser
d
iff: Only count l
i
nes
in
s
h
ow_shortstats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-15
Jonathan Ni
e
der
perl
/
Makefile: in
s
tal
l
G
i
t::SVN:
:
* when NO
_
P
E
RL_MAKEMAKER
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-15
Jonathan Niede
r
perl/Makefi
l
e
.
PL: wa
r
n about dup
l
ic
a
te mod
u
le l
i
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-13
Junio C
Ha
m
ano
M
e
rge branch
'
rj/gitweb-test-sans-date
-
parser'
commit
|
commitdiff
|
tree
2012-06-13
Junio C Hamano
Merge branch 'fc/git-c
o
mplete-h
e
lper-fi
x
'
commit
|
commitdiff
|
tree
2012-06-13
S
ZED
E
R Gábor
comple
t
io
n
: remove
cre
d
e
n
tial helpers f
r
om porcelain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-13
SZ
E
DER
Gábor
compl
e
t
ion:
put ma
i
n git and gi
t
k c
o
m
p
letion functions
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Ramsa
y
Jones
gitweb: Skip 'modification t
i
mes'
tests wh
e
n no date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C H
a
mano
Gi
t
1
.
7
.
11
-
rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C Ham
a
no
Merge git://git
h
u
b
.
com/git-l1
0
n/git
-
po
commit
|
commitdiff
|
tree
2012-06-12
Junio
C Hamano
Merge branch
'
mm/api-
c
redentials-doc
'
commit
|
commitdiff
|
tree
2012-06-12
J
u
nio
C
Hamano
Merge b
r
anch
'
jc/fm
t
-merge-msg-people
'
commit
|
commitdiff
|
tree
2012-06-12
Matthieu Moy
a
p
i
-
cred
e
n
tial
.
t
xt: doc
u
ment that
helpers fie
l
d is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-12
Junio C Ha
m
ano
M
e
r
g
e branch 'js/m
a
int-fast-export-mark-error'
commit
|
commitdiff
|
tree
2012-06-12
Joha
n
nes Schindel
i
n
fast-export: repo
r
t S
H
A-1 instead o
f
gi
b
beris
h
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-08
Junio
C H
a
mano
Merge branch 'mm/api-cr
e
den
t
ia
l
s-doc'
commit
|
commitdiff
|
tree
2012-06-08
Jef
f
King
docs: fix cross-di
r
ectory
linkgit references
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-07
Junio C
H
a
m
ano
Git 1
.
7
.
11-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-07
Jun
i
o C Ha
m
ano
Merge
branch 'mm/api-
c
redentials-doc'
commit
|
commitdiff
|
tree
2012-06-07
Junio C Haman
o
Mer
g
e bran
c
h '
r
r/
m
a
int-t3
5
10-c
a
scade-fix
'
commit
|
commitdiff
|
tree
2012-06-07
J
u
nio C Hamano
Merge bran
c
h 'jc/svn-auth-p
r
ovider
s
-u
n
usa
b
l
e
-
a
t-
1
.
6
.
12'
commit
|
commitdiff
|
tree
2012-06-07
Junio C
H
amano
Merg
e
branch 'cr/p
e
rsistent-https'
commit
|
commitdiff
|
tree
2012-06-06
Ju
n
i
o
C Hamano
fm
t
-merge-msg: ma
k
e
attribution
i
n
to c
o
mment lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-05
Junio C Hamano
Merge git://github
.
com/git-l10n/
g
i
t
-po
commit
|
commitdiff
|
tree
2012-06-04
Ramkumar
Rama
c
handra
t3510 (cherr
y
-pick-sequence): add m
i
ssing '&&'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
M
atthieu Moy
ap
i
-
c
reden
t
ials
.
txt
:
add "se
e
also" section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Matthieu Moy
api
-
credentials
.
tx
t
: me
n
t
i
on credential
.
h
e
lpe
r
explic
i
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Matthieu
M
oy
ap
i
-cr
e
dentials
.
txt:
s
how the
b
i
g pi
c
ture first
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
Junio
C
H
amano
doc:
f
ix xref li
n
k from
a
pi
d
ocs to ma
n
ual
p
ages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-04
J
unio C Hamano
git-svn: platf
o
r
m auth provi
d
er
s
a
re
work
i
n
g only on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C Haman
o
Git
1
.
7
.
1
1
-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Junio C Ham
a
no
Sync with
1
.
7
.
10
.
4
commit
|
commitdiff
|
tree
2012-06-03
Junio
C Hama
n
o
Git 1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-03
Ju
n
io C Ham
a
no
Merge branch '
e
f/m
a
int-rebase-er
r
or-messa
g
e' into maint
commit
|
commitdiff
|
tree
2012-06-01
Ju
n
i
o C Hama
n
o
U
p
d
at
e
draf
t
rele
a
se n
o
tes
t
o 1
.
7
.
11
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
J
u
nio C
Ha
m
an
o
M
e
r
ge branch
'
ef/
m
a
int-rebase-error-message'
commit
|
commitdiff
|
tree
2012-06-01
Junio C H
a
man
o
Merge
branch '
n
h/e
m
pty-rebase'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Mer
g
e br
a
n
c
h 'vr/rebase-autosqu
a
s
h-does-not-impl
y
-i'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ha
m
a
n
o
M
e
r
g
e branch 'mm
/
l
e
v
enstein-penalize-deletion-l
e
ss'
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
Merge bra
n
ch 'jl/submodule-report-ne
w
-p
a
th-o
n
ce'
commit
|
commitdiff
|
tree
2012-06-01
Junio C
H
a
ma
n
o
Sync with maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ha
m
ano
Start prep
a
ring
for 1
.
7
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-01
Junio
C
Ham
a
no
M
erge bra
n
ch '
e
f/http-o-d
e
pend
s
-on-gvf' into mai
n
t
commit
|
commitdiff
|
tree
2012-06-01
Juni
o
C H
a
man
o
Merge git://github
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hama
n
o
Merge branch
'
rs
/
maint-gr
e
p
-F' int
o
m
aint
commit
|
commitdiff
|
tree
2012-06-01
Junio
C Hamano
Me
r
ge
b
ranch 'jk/ide
n
t-split-fix
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-06-01
Junio C Ha
m
ano
Me
r
ge branch
'
jk/pretty-c
o
mmit-h
e
ader-incomplete-line
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
J
unio
C Hamano
Merge b
r
anch 'jk/format-person-part-buffe
r
-limit
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C
H
amano
Me
r
ge branch 'ap/checkou
t
-no-progress
-
for-n
o
n-tty'
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Junio C Hamano
M
erge
b
ran
c
h 'm
a
i
nt' of git://github
.
co
m
/
g
it-l10n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2012-06-01
Jiang Xin
i
18n: a
p
ply:
s
p
lit to fix a
p
artial i18n
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-31
Erik Faye
-
Lund
M
a
kefile: add mis
s
ing
G
I
T
-
V
E
RSION-FILE dependency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Colby Ranger
Add pe
r
sistent-https to contrib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Erik Fa
y
e-Lu
n
d
reba
s
e:
r
ep
o
r
t
i
nvalid commit correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
J
e
ff Kin
g
INSTALL:
u
pdate asciido
c
recommend
a
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-30
Junio C Ham
a
n
o
c
herry-pick: regres
s
ion
f
ix for e
m
pt
y
commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
J
ens Lehmann
submodules: print "registe
r
ed for path" mes
s
ag
e
only
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
J
u
nio C Hamano
Merge git:/
/
bogomips
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2012-05-29
Jeff King
t570
1
: mod
e
r
nize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Junio
C Hamano
Merg
e
branch
'
va/g
i
t-
p
4-tes
t
'
commit
|
commitdiff
|
tree
2012-05-29
J
unio C Hama
n
o
Me
r
ge
b
ranch
'jk/ident-gecos-
s
trb
u
f'
commit
|
commitdiff
|
tree
2012-05-29
Junio C Hamano
Merge
branch 'jk/fe
t
c
h
-pack-re
m
ov
e
-dups-opti
m
'
commit
|
commitdiff
|
tree
2012-05-29
Junio
C
Hamano
M
e
rge branch 'rs/refs-s
t
ring-
s
lice'
By René Scharfe (3) and
Junio C Hamano
(1)
commit
|
commitdiff
|
tree
2012-05-29
Junio C Ha
m
ano
Merge branch 'mh/
f
etch-pack-constness
'
commit
|
commitdiff
|
tree
2012-05-29
Juni
o
C
Hamano
M
erge
branch 'mh/r
e
f-api-l
a
zy-loose'
commit
|
commitdiff
|
tree
2012-05-29
Junio C Hamano
Merge b
r
anch 'ng/pac
k
-objects-cleanup'
commit
|
commitdiff
|
tree
2012-05-29
Vincent van Ravesteijn
D
o not
a
utosquas
h
in case of an
implied interactive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Ma
t
th
i
eu Moy
Reduce cost o
f
d
eletio
n
i
n
levenstein
dist
a
nce (4
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
V
itor Antunes
git-p4:
C
lean up branch test cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Vitor Antunes
gi
t
-p4:
V
erify detec
t
i
o
n of
"
e
mpty" branch creation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-29
Vitor Antunes
git-p
4
: Test chang
e
l
i
s
ts t
o
uching two branc
h
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Junio
C
Ha
m
ano
Git 1
.
7
.
11-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-05-25
Juni
o
C Ham
a
n
o
Me
r
ge branch 'sp/sh-win
d
ows-pwd'
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
Merge br
a
nch 'mh/test-
k
eep-prove-cac
h
e'
commit
|
commitdiff
|
tree
2012-05-25
Ju
n
io C Hamano
Me
r
ge branch 'r
s
/dir-strbuf-read-recurs
i
ve-fix'
commit
|
commitdiff
|
tree
2012-05-25
Junio C
H
ama
n
o
M
e
rge branch 'fc/git-complete-h
e
l
p
er-f
i
x'
commit
|
commitdiff
|
tree
2012-05-25
Junio C Hamano
Merge branch 'a
p
/checkout-no-progress-for-non-tty'
commit
|
commitdiff
|
tree
2012-05-25
Junio
C
Hamano
M
e
rge branch 'jk/format-pe
r
s
on-pa
r
t-buffer-limit
'
commit
|
commitdiff
|
tree
2012-05-25
Jun
i
o C H
a
mano
Merge branch 'j
k
/prett
y
-commit-header-incom
p
l
ete-line'
commit
|
commitdiff
|
tree
2012-05-25
J
unio
C
Hamano
Me
r
g
e bra
n
ch '
j
k/ident-split-fix'
commit
|
commitdiff
|
tree
next