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
git-merge(1): document diff-algorithm option to merge-recursive
2013-04-05
John Keeping
git-merge(1): docum
e
nt diff-algorit
h
m optio
n
to m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-16
Michal Pr
i
vo
z
nik
diff: Introduc
e
--
d
i
f
f
-algorithm comman
d
line o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-16
Michal
P
r
i
vozni
k
c
onf
i
g: Introd
u
ce
diff
.
a
l
gorithm
v
a
r
iable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-14
Mi
c
h
a
l Privoznik
git-completi
o
n
.
bash: Auto
c
omp
l
e
te --min
i
mal and --h
i
stogram
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-12
Junio C
H
a
mano
Update
d
ra
f
t release notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-12
Junio C Hamano
Merg
e
b
r
a
nch 'jk/maint-fast-im
p
ort-doc-reorder'
commit
|
commitdiff
|
tree
2013-01-12
Junio
C
Ham
a
no
Merg
e
br
a
nch 'j
k
/sh
o
rtlog-no-wra
p
-
d
oc'
commit
|
commitdiff
|
tree
2013-01-12
Junio
C Ham
a
n
o
Merge branch 'rs/zip-with-uncompressed-s
i
ze
-
in-the
.
.
.
commit
|
commitdiff
|
tree
2013-01-12
Junio C Hamano
Merge bra
n
ch 'rs/zip-
t
ests'
commit
|
commitdiff
|
tree
2013-01-12
Junio
C Hamano
Mer
g
e branch 'jn/xml-depends-on-
a
sci
i
doc-c
o
nf
'
commit
|
commitdiff
|
tree
2013-01-12
J
u
nio
C
Hama
n
o
Merge branch 'jk/un
i
fy-exit-co
d
e-by-r
e
c
eiving-signal'
commit
|
commitdiff
|
tree
2013-01-12
Junio
C
Hamano
M
e
rge branch 'jc
/
merge-
b
lobs'
commit
|
commitdiff
|
tree
2013-01-12
Jun
i
o
C Hamano
M
erge
b
r
a
n
ch '
j
c/format-patch-
r
eroll'
commit
|
commitdiff
|
tree
2013-01-12
Junio C Hamano
Merge branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2013-01-12
Jun
i
o C Ha
m
ano
Me
r
g
e
br
a
nch 'as/api-allo
c
ation-doc' into mai
n
t
commit
|
commitdiff
|
tree
2013-01-12
Ju
n
i
o
C Ham
a
no
Merge branch 'jk/enable-test
-
lint
-
by-
d
efault' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2013-01-12
Jun
i
o C
Hamano
Mer
g
e b
r
anch 'ap/merge-st
o
p-at-prepare-
c
ommit-
m
sg-failure
.
.
.
commit
|
commitdiff
|
tree
2013-01-12
Junio C Hamano
Merge bra
n
ch 'jc/su
b
m
itting
p
atches' into
m
ai
n
t
commit
|
commitdiff
|
tree
2013-01-12
Junio C Haman
o
Merge branch 'o
s
/gitweb-h
i
ghlight-u
n
captured' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-12
Junio
C
H
a
m
ano
Merge branch
'
j
n/le
s
s
-r
e
configure'
i
nto
m
aint
commit
|
commitdiff
|
tree
2013-01-12
Junio C Hamano
Mer
g
e
b
ranch 'kb/
m
aint-bundle-doc'
into
maint
commit
|
commitdiff
|
tree
2013-01-12
J
u
nio C Hamano
M
e
r
g
e
branch 'as/test-name-
a
l
i
a
s-uniquely'
i
nto main
t
commit
|
commitdiff
|
tree
2013-01-12
Juni
o
C Hamano
Merge bran
c
h 'jn/war
n
-on-inaccessibl
e
-loosen' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-12
J
u
n
io
C
H
a
m
a
n
o
Merge branch '
j
a
/directory-
a
ttrs' in
t
o maint
commit
|
commitdiff
|
tree
2013-01-12
Junio C Ha
m
ano
Merge branch 'jc
/
fetch
-
ign
o
re-symref' into maint
commit
|
commitdiff
|
tree
2013-01-12
Jun
i
o C Hamano
M
erge
branch 'ss/svn-prompt'
i
nto maint
commit
|
commitdiff
|
tree
2013-01-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2013-01-10
J
u
ni
o
C Hamano
U
pdate dra
f
t releas
e
notes to
1
.
8
.
2
commit
|
commitdiff
|
tree
2013-01-10
Jun
i
o C Hamano
Prepare for 1
.
8
.
1
.
1
commit
|
commitdiff
|
tree
2013-01-10
Christian Couder
Makefile:
d
etect whe
n
PYTHON_PATH changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-10
Ju
n
i
o C
H
a
mano
Merge branch 'ta/re
m
ove-stale-
t
ranslated
-
tut' int
o
.
.
.
commit
|
commitdiff
|
tree
2013-01-10
Juni
o
C Hamano
Merge branch
'tb/te
s
t-t9810
-
no-se
d
-i' in
t
o maint
commit
|
commitdiff
|
tree
2013-01-10
Ju
n
io C H
a
m
a
no
Merge branch 't
b
/test-t9020-no-which' into
maint
commit
|
commitdiff
|
tree
2013-01-10
Junio
C
Ha
m
ano
Merge bra
n
ch 'm
h
/pthr
e
ad
s
-a
u
toconf' into mai
n
t
commit
|
commitdiff
|
tree
2013-01-10
Junio
C
H
a
mano
Merge branch 'j
c
/
s
a
m
e-encoding' into ma
i
n
t
commit
|
commitdiff
|
tree
2013-01-10
Junio C Hama
n
o
M
e
rge branch 'sp/shortlog-
m
issing-l
f
'
into m
a
int
commit
|
commitdiff
|
tree
2013-01-10
Junio C Hamano
Merge branch 'md/git
w
eb
-
s
ort-by-
a
g
e' i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2013-01-10
Junio C Hamano
M
e
rge br
a
nc
h
'nd/invalidate-i-t-a-cache-tree' into
.
.
.
commit
|
commitdiff
|
tree
2013-01-10
Junio C Haman
o
M
e
r
g
e branch 'jk/repa
c
k-ref
-
racefix' into maint
commit
|
commitdiff
|
tree
2013-01-10
J
u
nio C H
a
mano
M
e
r
g
e
b
r
anch 'rb/h
t
tp-cert-cred-no-us
e
rna
m
e-
p
ro
m
pt
.
.
.
commit
|
commitdiff
|
tree
2013-01-10
Jun
i
o C Hamano
Merge branch 'jc/comm
e
n
t-cygwin-
w
i
n
3
2ap
i
-in-makefile'
commit
|
commitdiff
|
tree
2013-01-10
Junio C
Ha
m
ano
Merge branch 'as/api
-
allocati
o
n-d
o
c'
commit
|
commitdiff
|
tree
2013-01-10
Junio
C
Ha
m
a
no
Merge branch 'rs/lea
v
e-base-name-in-n
a
me-field-of-
t
ar'
commit
|
commitdiff
|
tree
2013-01-10
Junio C Hamano
M
e
rge branch '
j
l/interrupt-clone-remove
-
separ
a
te-git
.
.
.
commit
|
commitdiff
|
tree
2013-01-10
Junio C Hama
n
o
Merge branch '
a
s/
d
ir-c-cl
e
anup
'
commit
|
commitdiff
|
tree
2013-01-10
Juni
o
C
Hamano
Merge b
r
anch 'jk/conf
i
g-uname'
commit
|
commitdiff
|
tree
2013-01-10
Ju
n
i
o
C Ham
a
no
Merge branch
'
nd/
w
i
ldmatch'
commit
|
commitdiff
|
tree
2013-01-10
Ju
n
io C
H
amano
Mer
g
e branch 'tb
/
test-shell
-
lint'
commit
|
commitdiff
|
tree
2013-01-10
Junio
C
Hamano
Merge branch 'mz/pic
k
-unborn'
commit
|
commitdiff
|
tree
2013-01-10
Ju
n
io C
Hamano
Mer
g
e branch 'aw/rebase-
a
m-failure-detec
t
ion'
commit
|
commitdiff
|
tree
2013-01-10
Ju
n
i
o
C Hamano
Merge bran
c
h 'jc/maint-fmt-merge
-
msg-no-edit-l
o
se-
c
redit'
commit
|
commitdiff
|
tree
2013-01-09
John Keeping
git-fa
s
t-impo
r
t(1): reor
g
an
i
s
e options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-09
Jo
h
n Keeping
git-fa
s
t-impor
t
(1): c
o
m
b
ine do
c
umentation of --[no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-09
J
oh
n
Keeping
g
it
-
shortlog(1): documen
t
b
e
haviour
o
f zero
-
width wr
a
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-09
J
u
n
io
C
Hama
n
o
Update
d
raft relea
s
e notes to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-09
Junio C Hamano
Merge
branch 'master'
of git://github
.
com/git-l10n
.
.
.
commit
|
commitdiff
|
tree
2013-01-09
J
u
nio C Hamano
Merge branch 'nd/maint
-
branch-desc-do
c
'
commit
|
commitdiff
|
tree
2013-01-09
Junio C Hama
n
o
Me
r
ge br
a
n
c
h 'jk/e
n
able-t
e
s
t
-
l
int-by-default'
commit
|
commitdiff
|
tree
2013-01-09
Junio C Hamano
Merge branch 'ap/merge-stop-a
t
-prepare-commit-ms
g
-failu
r
e'
commit
|
commitdiff
|
tree
2013-01-09
J
u
nio C Hama
n
o
M
erge branch 'fc/remote-b
z
r
'
commit
|
commitdiff
|
tree
2013-01-09
Junio C Hamano
Merge br
a
n
c
h
'jc/submit
t
ing
p
atches'
commit
|
commitdiff
|
tree
2013-01-09
Juni
o
C
Hamano
Merge b
r
anch 'o
s
/gitweb-highlight
-
u
n
captured'
commit
|
commitdiff
|
tree
2013-01-09
Junio
C H
a
man
o
Merg
e
branch 'jn/less-reconf
i
gur
e
'
commit
|
commitdiff
|
tree
2013-01-09
Junio C Hamano
Merge br
a
nch 'er/py
t
h
on-v
e
rsi
o
n
-requir
e
me
n
ts'
commit
|
commitdiff
|
tree
2013-01-09
J
u
n
io
C
Hamano
Merge branch 'e
r
/stop-r
e
c
ommending-parsecvs'
commit
|
commitdiff
|
tree
2013-01-08
Ju
n
io C Hama
n
o
Merge b
r
a
n
c
h 'ma
i
n
t'
commit
|
commitdiff
|
tree
2013-01-08
J
unio C Hamano
Merge branch
'k
b
/main
t
-bundle-doc'
commit
|
commitdiff
|
tree
2013-01-08
Junio C Hama
n
o
Merge branch 'as
/
tes
t
-name-alias-uniquely'
commit
|
commitdiff
|
tree
2013-01-08
J
u
nio C
Hamano
M
erge branch
'
t
a
/
r
em
o
v
e-stale-transl
a
ted-t
u
t'
commit
|
commitdiff
|
tree
2013-01-08
Junio
C
Hamano
Merge branch 'tb/
t
est-t9810-n
o
-sed-
i
'
commit
|
commitdiff
|
tree
2013-01-08
Junio C Hamano
Merge branch
'
t
b/tes
t
-
t9020-n
o
-wh
i
ch'
commit
|
commitdiff
|
tree
2013-01-08
Junio C
H
a
man
o
Merge branch 'jk/ma
i
nt-fast
-
import-
d
o
c
-dedup-done'
commit
|
commitdiff
|
tree
2013-01-08
J
u
n
io C Hama
n
o
Merge
branch 'jk/p
a
ths
p
e
c
-liter
a
l'
commit
|
commitdiff
|
tree
2013-01-08
Junio C Hamano
M
e
rge branch 'jk/m
a
int-f
a
st-i
m
port-doc-dedup-do
n
e'
commit
|
commitdiff
|
tree
2013-01-08
John Keeping
git-fast-impo
r
t
(
1): remove dupl
i
ca
t
e
'
-
-don
e
'
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-08
René Scharfe
t1402: work
aroun
d
shell quoting
i
ssue on NetBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-08
Junio C H
a
mano
M
erge
b
ranch
'
ms/subtree
-
f
i
xlets' into maint
commit
|
commitdiff
|
tree
2013-01-08
Jun
i
o C Hamano
Mer
g
e
b
ranch 'ss/nedm
a
lloc-compilation' int
o
maint
commit
|
commitdiff
|
tree
2013-01-08
Junio C Hamano
Merge branch 'jc
/
maint-fnmatch-old-style-definition
.
.
.
commit
|
commitdiff
|
tree
2013-01-08
Junio C Hamano
M
e
rge bran
c
h
'
jc/te
s
t-portabil
i
ty'
i
nto
maint
commit
|
commitdiff
|
tree
2013-01-08
Junio C Hamano
Merge branch 'jc/
m
ain
t
-
f
bsd-sh-ifs
-
workaround'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2013-01-08
Junio
C Ham
a
no
Merge
branc
h
'jc/mk
s
temp-more-
c
aref
u
l-er
r
or-reportin
g
.
.
.
commit
|
commitdiff
|
tree
2013-01-08
Junio
C
Hamano
Me
r
ge br
a
nch 'j
c
/test-cvs-no-init-in-exi
s
ting-dir'
.
.
.
commit
|
commitdiff
|
tree
2013-01-08
Ju
n
io C Hamano
Merge br
a
nch '
j
c
/
m
aint-test-p
o
rtability'
i
n
to
maint
commit
|
commitdiff
|
tree
2013-01-08
W
.
T
r
ev
o
r Kin
g
remote-hg: Fix biridectionality
-
> bid
i
rectiona
l
ity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-07
René Sc
h
a
rf
e
t5003:
ch
e
ck
if unzip supp
o
rts syml
i
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-07
René Scharfe
t
5
000
,
t500
3
: move ZIP tests
into thei
r
own script
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-07
René Scharf
e
t0024, t500
0
:
use test_lazy_prere
q
for UNZIP
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-07
R
ené Scharfe
t002
4
, t5000: clear variable UNZIP, us
e
G
IT_UNZIP instead
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-07
Junio C Hamano
M
e
rge branch 'mz/o
n
eway-merge-wo-
u
-no-
l
stat'
commit
|
commitdiff
|
tree
2013-01-07
Junio C
H
amano
Merge branch
'
c
c/no-gitk-bui
l
d-dependency'
commit
|
commitdiff
|
tree
2013-01-07
Juni
o
C Hama
n
o
M
e
rge b
r
anch
'
jn/warn-on-inaccessible-loosen'
commit
|
commitdiff
|
tree
2013-01-07
Juni
o
C Hama
n
o
Merge
branch '
j
c/apply-trai
l
ing-blan
k
-remo
v
al'
commit
|
commitdiff
|
tree
2013-01-06
Mark L
e
v
e
dahl
Makefil
e
:
ad
d
c
omm
e
nt on CYGWIN_
V
15_WI
N
32API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-06
A
dam Spiers
api
-
alloc
a
ti
o
n-
g
r
o
wi
n
g
.
txt
:
encourag
e
b
e
tter
variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-06
R
ené Sch
a
rfe
archive-zip
:
w
rite uncompre
s
sed size
into he
a
der even
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-06
J
o
h
a
n
nes Sixt
t6130-pat
h
spec-
n
oglob: Window
s
does not all
o
w a
f
ile
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-06
J
onat
h
an Nieder
docs: manpag
e
XML depend
s
on as
c
iidoc
.
conf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-06
Jeff King
ru
n
-command: enc
o
de s
i
gna
l
death
a
s a posit
i
ve integer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-01-06
Junio C
H
amano
Update draft
r
elease
n
ot
e
s to 1
.
8
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next