repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
test that git status works with merge conflict in, .gitmodules
2011-05-13
Juni
o
C
Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
a
w
/maint-rebase-i-p-no-
f
f
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'js/b
l
ame-pa
r
sename' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge br
a
nch 'gr/cvsimpo
r
t-alternative-
c
vs
p
ass
-
locatio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'cj/p4merge'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
Me
r
ge b
r
an
c
h 'jk/me
r
ge-
o
n
e
-fi
l
e
-work
i
ng-
t
ree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Me
r
ge branch 'jc
/
fix-d
i
ff-files-unm
e
r
ged' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hama
n
o
Merg
e
branch 'mz/maint-rename-unm
e
rged'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
t3701:
fix here d
o
cument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch 'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge
b
ranch 'sp/
m
aint-clear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ham
a
n
o
Merge branch
'jk/maint-stas
h
-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Mer
g
e bra
n
ch
'
j
k/
m
aint-upload-pack-shall
o
w' into
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C H
a
mano
M
e
rge branch 'dm/stash-k-i-p'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge
bran
c
h 'jc/
p
ack-objects
-
bigfile' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge bra
n
ch 'mg
/
r
e
fl
o
g-
w
ith-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge bra
n
ch 'jk
/
stash-loosen-safety' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch '
a
r/cl
e
an-
r
mdir-empt
y
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
M
e
rg
e
branch
'
m
g/sha1-pat
h
-advise' into maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
Start 1
.
7
.
5
.
1
m
a
i
n
tenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
Merge bran
c
h
'
m
g
/x-yea
r
s
-
12-month
s
' into main
t
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C Haman
o
ht
t
p: c
l
ear POS
T
FIELDS w
h
e
n
initializing a
s
lot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
i
o
C Hamano
d
i
ff-fi
l
es: show unmerged
e
ntries co
r
rectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
d
i
ff: remo
v
e often
u
nu
s
ed parameter
s
fr
o
m
d
iff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C
Hamano
diff
.
c: return filepair
from diff_
u
nmerg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
e
st: use $
_
z40
f
r
om test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C
Hama
n
o
G
it 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
un
i
o C Ham
a
no
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Gi
t
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Revert "ru
n
-co
m
mand: pre
t
tify
-
D_FORTIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-14
J
unio
C
H
am
a
no
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
a
m
ano
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hamano
M
erge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
H
a
mano
Merg
e
branch
'
jc/rev-list
-
options-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
Merge b
r
anch
'j
s
/checkout-untracked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-12
Ju
n
i
o C Hama
n
o
Merge br
a
nch 'js/ch
e
ckou
t
-
untracked-symlink
'
commit
|
commitdiff
|
tree
2011-04-12
Junio
C Hamano
Me
r
ge branc
h
'nd/ini
t
-g
i
tdir'
commit
|
commitdiff
|
tree
2011-04-11
Junio C H
a
mano
M
erge git:/
/
g
i
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Juni
o
C
Hamano
Merg
e
git://git
.
kernel
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
mano
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Sync with
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
G
it
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
n
o
Merge b
r
anch 'nm/mai
n
t-confli
c
ted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch 'mg/rev-list-n-r
e
v
e
rse-doc' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C
Haman
o
M
e
r
g
e branch
'
jk/maint-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
mano
Merge br
a
nch 'mg/d
o
c-r
e
visions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C
H
amano
Teach core
.
bigfilethr
e
as
h
old t
o
pack-o
b
j
e
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio
C Ha
m
ano
Me
r
ge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
i
o
C Hamano
Merge bran
c
h
'jl/sub
m
odule
-
fe
t
ch-o
n
-de
m
an
d
'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ham
a
no
M
erge
b
ranch 'jc/rev-list-o
p
t
i
on
s
-fix'
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o
C Hamano
Me
r
ge branch 'nm/ma
i
nt-conflicted-s
u
b
m
odule-entri
e
s'
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
St
a
rt pr
e
paring for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hamano
Merg
e
branch 'jc/index-update-if-ab
l
e' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
H
amano
Merge b
r
a
n
ch
'
lt/default-abbrev' into main
t
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Hamano
Merge bra
n
ch 'jc
/
main
t
-r
e
v-list-culled-bounda
r
y
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Ham
a
n
o
Merge
branch 'm
m
/m
a
int-log-n-with-
d
iff-filte
r
ing' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C Ham
a
no
Merge branch 'jk/form
a
t-p
a
t
c
h-multil
i
ne-header' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Hama
n
o
Me
r
ge b
r
anch 'jn/maint-instaweb-pl
a
ck-fix
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge b
r
anch 'lp/config-vername-check' into m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
amano
Update release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
amano
Sync with 1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hamano
G
i
t 1
.
7
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
D
oc:
m
ention -
-
delta-base
-
offset i
s
the d
e
fa
u
lt fo
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-02
Junio
C Hamano
M
erge branch 'n
d
/
in
i
t-gitdir
'
commit
|
commitdiff
|
tree
2011-04-02
J
u
n
io C
H
am
a
no
Merge branch
'jc/m
e
rge-sans-branc
h
'
commit
|
commitdiff
|
tree
2011-04-02
J
u
nio
C Haman
o
Merge bran
c
h '
j
r/g
r
ep-en-confi
g
'
commit
|
commitdiff
|
tree
2011-04-02
J
unio
C
Hamano
Merge bra
n
ch 'ab/i18n
-
st'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Ha
m
ano
Merge bran
c
h 'jk
/
pul
l
-into-empty'
commit
|
commitdiff
|
tree
2011-04-02
J
u
nio C Hamano
M
e
rge br
a
nch
'
sb/sparse-more'
commit
|
commitdiff
|
tree
2011-04-02
Junio C H
a
m
a
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-01
J
u
nio C
H
ama
n
o
Merg
e
branc
h
'nd/index-doc
'
into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merg
e
br
a
nch 'pk/stash-apply-status
-
rela
t
i
v
e' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge b
r
anch 'j
c
/maint-diff-q-filter' into maint
commit
|
commitdiff
|
tree
2011-04-01
Junio
C Hamano
Merge branch 'js/maint-stash-index-copy' into main
t
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge bra
n
ch 'mg/doc-bisect
-
tweak-worktree' into maint
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o C
Ha
m
ano
M
e
rge branc
h
'jh/ma
i
n
t-
d
o-not-
t
rack-non
-
branc
h
es
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio
C Ha
m
ano
Merge branch 'fk/maint-cvsimport-early-failu
r
e' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
J
unio
C
H
a
mano
Merge
bran
c
h 'j
c
/
mai
n
t
-app
l
y-report-offset'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Haman
o
Merge
b
ranch 'jc/maint-apply-no-double
-
pat
c
h' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C
H
amano
Merge branch 'js/chec
k
o
ut-untracked-
s
ymlink' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Mer
g
e "checkout ambiguous re
f
bugf
i
x" into main
t
commit
|
commitdiff
|
tree
2011-04-01
Junio C H
a
m
ano
"log --ch
e
rry-pic
k
" documentati
o
n
regression
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio C
Hamano
Git 1
.
7
.
5-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-31
Junio C Hamano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-03-31
J
u
n
io C H
a
ma
n
o
parse-remote: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-03-30
Junio C Ha
m
ano
t80
0
1:
check the exi
t
status
of
t
he com
m
and
b
e
i
n
g tested
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-30
Ju
n
io C Hama
n
o
Merge bran
c
h '
s
vn
-
fe' of git://repo
.
o
r
.
c
z/git/jrn
commit
|
commitdiff
|
tree
2011-03-29
Junio
C Hama
n
o
Merge
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2011-03-29
Junio C H
a
mano
Merge branch 'jc/fetch-progressive-stride'
commit
|
commitdiff
|
tree
2011-03-29
Junio C Ha
m
ano
Merge branches 's
p
/maint-f
e
tc
h
-pack-stop-ea
r
ly' a
n
d
.
.
.
commit
|
commitdiff
|
tree
2011-03-29
J
u
nio C Ham
a
no
Rev
e
r
t tw
o
"no-done" reverts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
J
u
n
i
o C H
a
mano
enable "no-don
e
" e
x
te
n
sion onl
y
wh
e
n s
e
rving over smart
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Jun
i
o C
H
a
m
a
n
o
Fix poten
t
i
al local
deadlock during
f
e
t
ch-pa
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Ju
n
i
o
C Ham
a
no
enabl
e
"no-done
"
extension only wh
e
n fe
t
chi
n
g over
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-03-29
Junio
C
Hamano
R
e
vert "fetch-p
a
ck
:
I
m
plem
e
nt no-done capa
b
ility"
commit
|
commitdiff
|
tree
2011-03-29
J
u
n
io
C
Ha
m
ano
Rev
e
rt "upload-
p
ack:
Implement n
o
-done
cap
a
bility"
commit
|
commitdiff
|
tree
next