repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/maint-merge-recursive-r-d-conflict'
2009-01-07
Junio C
Hamano
M
e
rge
b
ranch '
j
s/mai
n
t-merge-re
c
u
r
sive-r-d-conflict'
commit
|
commitdiff
|
tree
2009-01-07
Ju
n
io C Hamano
Merg
e
branch 'mk/gitwe
b
-f
e
at
u
re'
commit
|
commitdiff
|
tree
2009-01-07
Jun
i
o C Hama
n
o
M
e
rge branch 'cb/
m
erge-recursive-fix'
commit
|
commitdiff
|
tree
2009-01-07
J
unio C Hamano
Merg
e
b
ranch 'k
k
/maint-http
-
push'
commit
|
commitdiff
|
tree
2009-01-07
Ju
n
io
C Hamano
Merge branch
'
mv/um-pdf'
commit
|
commitdiff
|
tree
2009-01-07
J
u
nio C Hamano
Merge branch 'jn/
g
itweb-blame'
commit
|
commitdiff
|
tree
2009-01-07
Ju
n
i
o C H
a
mano
Merge branch 'w
p
/add-p-go
t
o'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2009-01-07
J
unio C Hamano
Merg
e
branch 'ma
i
nt
-
1
.
6
.
0
' into maint
commit
|
commitdiff
|
tree
2009-01-07
J
u
n
i
o C
H
a
mano
Merge bran
c
h
'maint-1
.
5
.
6' into m
a
int-1
.
6
.
0
commit
|
commitdiff
|
tree
2009-01-06
J
u
nio C
H
amano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-01-03
Junio C Hamano
M
e
r
ge branch 'jc/m
a
int-do-not-sw
i
t
c
h
-
to-non-commit'
commit
|
commitdiff
|
tree
2009-01-03
Junio C Hamano
Merge branch 'ap/maint-
a
pply-mod
e
fix'
commit
|
commitdiff
|
tree
2009-01-03
Jun
i
o C Haman
o
g
it
c
heckout: do n
o
t a
l
low s
w
itchin
g
to a tree-ish
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-02
Junio C Hamano
bu
i
l
tin-apply: prevent
non-explic
i
t per
m
ission changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-01-01
J
u
nio C Ha
m
ano
Merge branch 'cb/mer
g
etool'
commit
|
commitdiff
|
tree
2009-01-01
J
u
nio
C Ha
m
a
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-29
Junio C Hamano
Merge branch
'lt/reset-me
r
ge
'
commit
|
commitdiff
|
tree
2008-12-29
Junio C H
a
man
o
Merge
branch
'
np
/
auto-t
h
rea
d
'
commit
|
commitdiff
|
tree
2008-12-29
Junio C H
a
m
ano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-12-29
Juni
o
C Hamano
Prepare for v1
.
6
.
1
.
1 ma
i
ntena
n
ce r
e
le
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Junio C Ham
a
n
o
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-27
Junio C Hamano
St
a
rt 1
.
6
.
2
c
y
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-27
Junio C Ha
m
ano
Merge branch 'rs/maint-tfor
m
at-foldline' into maint
commit
|
commitdiff
|
tree
2008-12-27
Junio C Ham
a
no
Merge bra
n
ch
'
rs/main
t
-
r
etval-fix' into maint
commit
|
commitdiff
|
tree
2008-12-27
Junio C Ha
m
ano
Merge
b
ranch 'sp/ma
i
nt-describ
e
-all-tag-warning' int
o
.
.
.
commit
|
commitdiff
|
tree
2008-12-25
J
u
nio C Ham
a
no
GIT 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-24
Junio C Hamano
Merge b
r
anc
h
'js/
r
eb
a
s
e-i-p'
commit
|
commitdiff
|
tree
2008-12-22
Junio C
H
amano
GIT 1
.
6
.
1-
r
c4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Haman
o
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-22
J
unio C Ha
m
a
n
o
M
erge git://git
.
kernel
.
org/pu
b
/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2008-12-21
Jun
i
o C Haman
o
send-
e
m
ail: futur
e
proof split_addrs
(
) sub
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Junio C
Hamano
Ma
k
e s
u
re lockfiles a
r
e
u
nl
o
cked when d
y
ing on
SIGPIPE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ha
m
ano
Merge bra
n
ch
'maint' to sync
with GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
H
amano
GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
unio
C H
a
mano
f
a
st
-
impor
t
: ma
k
e tagger information optio
n
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Merge br
a
n
ch 'lt/readli
n
k'
commit
|
commitdiff
|
tree
2008-12-18
Junio
C
Hamano
Merge git
:
//repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
co
m
bine-diff
.
c
:
u
s
e s
t
rbuf_re
a
dlin
k
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Ha
m
ano
b
u
iltin-blame
.
c: use strbu
f
_readlink
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io
C Hamano
mak
e
_
absol
u
te_path(
)
: ch
e
ck boun
d
s
whe
n
seeing an overlon
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
gitweb:
do n
o
t run
"
git diff
"
that is Por
c
elai
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
G
IT 1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hama
n
o
GIT 1
.
5
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio
C
Ham
a
no
GI
T
1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gitw
e
b
: do not run "git diff"
t
hat is
P
orcel
a
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-12-15
Ju
n
io C H
a
mano
Merge branc
h
'c
b
/maint-merge-recursive-fix' int
o
cb
.
.
.
commit
|
commitdiff
|
tree
2008-12-15
Jun
i
o C Haman
o
merge-recursiv
e
: do not clob
b
er untracked wo
r
king tree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Ju
n
io
C Hamano
pager: do
n
ot dup2 st
d
e
r
r if it is already redirected
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
J
u
nio C
H
a
mano
git
-
show: do not segfault when showing a bad ta
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
J
u
nio C Ham
a
no
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2008-12-11
Junio
C Ham
a
no
Merge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Junio C
Hama
n
o
Fix t4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-10
Ju
n
io C Hamano
Docu
m
e
nt "git-
r
ese
t
--merge
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ju
n
io C
Hamano
w
ork around P
y
thon warnings f
r
om AsciiDoc
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
amano
read-cach
e
.
c: typo
f
ix in comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
H
am
a
n
o
builtin-checkout
.
c:
check error
r
e
turn from re
a
d_cach
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C Hamano
Point
"stale
"
1
.
6
.
0
.
5
documentation
f
rom th
e
m
a
in git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C
H
a
mano
Reve
r
t "git-stash: use git re
v
-
parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o C
Hamano
Update draft
r
el
e
ase notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
M
e
rge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
C Hamano
G
IT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
U
pdate draft release note
s
to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Merge br
a
n
c
h 'jc/am-opti
o
ns
'
commit
|
commitdiff
|
tree
2008-12-06
Junio C
H
amano
g
it-am: rename apply_o
p
t_
e
x
tra
file
t
o
appl
y
-opt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Ju
n
io C Hamano
Test
that
g
it-am does
n
ot lo
s
e -C/-p/--whitesp
a
c
e
optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
g
i
t-am:
propagate --3way options as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C Hamano
git-am: propagat
e
-C<n>, -p<n
>
option
s
as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am
--whitespace: do n
o
t lose the command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
Merge branch 'dm/svn-remo
t
e'
commit
|
commitdiff
|
tree
2008-12-04
J
un
i
o C
Hama
n
o
M
e
r
ge b
r
anch
'
j
n
/
gitwe
b
-
u
tf8'
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
M
erge bra
n
ch 'jc/rm-i-
t
-a'
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
M
erg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Install git-stage in exe
c
-pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Jun
i
o C Hamano
Merge bra
n
ch 'jk/maint-com
m
it-v-s
t
rip' into maint
commit
|
commitdiff
|
tree
2008-12-03
Junio C Ha
m
a
no
Merge
b
ranch '
b
c/maint-
k
eep-pack' into maint
commit
|
commitdiff
|
tree
2008-12-03
Junio C Haman
o
Merge
b
ranch 'j
s
/min
g
w-re
n
ame-fi
x
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-02
J
unio
C
Hamano
M
a
k
efile: in
t
roduce
N
O_PTHREADS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-02
Junio C Hamano
M
e
r
ge branch 'gb/gitweb-feat
u
r
e
'
commit
|
commitdiff
|
tree
2008-12-02
Jun
i
o
C
Hamano
M
e
rge git://repo
.
or
.
c
z
/
g
it-
g
ui
commit
|
commitdiff
|
tree
2008-12-02
Junio C Hamano
M
erge g
i
t
:
//g
i
t
.
k
ernel
.
or
g
/pub/scm
/
gi
t
k/gitk
commit
|
commitdiff
|
tree
2008-12-01
Junio C
H
amano
GIT 1
.
6
.
1-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C
H
amano
Include git-gui--askpass in git-gui RPM package
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hama
n
o
Me
r
ge
g
i
t
://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-01
Junio C Ham
a
no
M
e
r
ge gi
t
://repo
.
or
.
cz
/
git-g
u
i
commit
|
commitdiff
|
tree
2008-12-01
J
unio C Haman
o
send-email: do no
t
reverse the command line arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
J
u
nio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-12-01
Juni
o
C Ha
m
ano
Update draft
release notes to 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Haman
o
Merge b
r
anch 'st/main
t
-tag' into ma
i
n
t
commit
|
commitdiff
|
tree
2008-12-01
Jun
i
o C Hama
n
o
M
e
rge bra
n
ch 'mk/m
a
in
t
-
c
g-push' into maint
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
gitw
e
b: renam
e
gitweb_chec
k
_featu
r
e to git
w
eb_get_feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
J
u
ni
o
C Hamano
gitweb: f
i
x '
c
ta
g
s
'
fe
a
ture check an
d
o
t
h
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Ham
a
no
git add
-
-intent-t
o
-add: d
o
not let
a
n empty blob be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-29
Junio
C
Hamano
git add --
i
nten
t
-
t
o-add: fix removal of cached em
p
tiness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-29
Junio C Hamano
built
i
n-rm
.
c:
e
x
pl
a
in and clarify
t
he "local chang
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-29
Jun
i
o C Ha
m
a
no
Merge
b
ranc
h
'nd
/
narrow' (early
p
art) into jc/a
d
d-i-t-
a
commit
|
commitdiff
|
tree
2008-11-28
Junio C
Hamano
M
erge branch 'cc/bisect-skip'
commit
|
commitdiff
|
tree
next