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
J
u
nio C Hamano
Merge branch 'js/ma
i
n
t-merge-recursive-r-d-confli
c
t'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Merge branch 'mk
/
gi
t
w
eb-feature'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Merge branch 'cb/m
e
rg
e
-
r
e
cursive-fix'
commit
|
commitdiff
|
tree
2009-01-07
Junio
C
H
a
mano
Merg
e
b
r
anch 'kk/maint-http-push'
commit
|
commitdiff
|
tree
2009-01-07
Junio C
Hamano
Merge branch 'mv/
u
m-p
d
f'
commit
|
commitdiff
|
tree
2009-01-07
J
u
nio C Hamano
M
erge bran
c
h
'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Merge
b
ranch
'wp/add-p-goto'
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-01-07
Juni
o
C Hamano
Mer
g
e branch 'maint-1
.
6
.
0'
int
o
m
aint
commit
|
commitdiff
|
tree
2009-01-07
Jun
i
o C
H
amano
Merge branch
'ma
i
nt
-
1
.
5
.
6' int
o
maint
-
1
.
6
.
0
commit
|
commitdiff
|
tree
2009-01-06
Junio C Ha
m
ano
Merge b
r
a
nch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2009-01-03
Junio C
Hamano
Merge branch 'jc/maint-
d
o
-
not
-
s
w
i
t
ch-to-non
-
commit'
commit
|
commitdiff
|
tree
2009-01-03
Junio
C
Hama
n
o
Merge bra
n
c
h
'ap/maint-
a
pply-modefix'
commit
|
commitdiff
|
tree
2009-01-03
J
u
nio
C
Hamano
git checkout:
do not allow
switchi
n
g
to a tree-i
s
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-02
Junio C Hamano
builtin-ap
p
l
y
: preve
n
t
non-explicit p
e
rm
i
ssion cha
n
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-01
Juni
o
C Ham
a
n
o
Merge
b
ra
n
c
h
'
cb/
m
e
r
getool'
commit
|
commitdiff
|
tree
2009-01-01
Juni
o
C
H
amano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-12-29
J
u
nio C Ha
m
ano
Merge b
r
a
n
ch 'lt/reset-merge'
commit
|
commitdiff
|
tree
2008-12-29
Junio C Hamano
M
erge
bra
n
ch 'np/aut
o
-
t
hread'
commit
|
commitdiff
|
tree
2008-12-29
Jun
i
o C Hamano
M
e
rg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-12-29
Junio C H
a
m
a
n
o
Prepare
f
or v1
.
6
.
1
.
1
m
ainte
n
ance release
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
J
u
nio
C
Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-27
J
u
n
i
o C Hamano
Start 1
.
6
.
2 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Ju
n
io C Hamano
Merge branch 'rs/maint-tformat-fo
l
dline
'
into maint
commit
|
commitdiff
|
tree
2008-12-27
J
u
nio C Hamano
Merge branch 'rs/maint-ret
v
al-fix' into
m
aint
commit
|
commitdiff
|
tree
2008-12-27
Jun
i
o C Ham
a
no
Merge branch '
s
p/m
a
int-de
s
cribe-all-tag-warning' into
.
.
.
commit
|
commitdiff
|
tree
2008-12-25
Juni
o
C Ha
m
a
no
GIT 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-24
Junio
C
H
a
m
ano
Merge
bra
n
ch
'
js/rebase-i-p'
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hamano
GIT 1
.
6
.
1-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Ju
n
io C Hamano
Me
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2008-12-22
Junio
C
Hamano
M
erge git://git
.
k
e
rnel
.
org/pub
/
scm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2008-12-21
Jun
i
o C Ha
m
ano
send-emai
l
: futureproof spli
t
_addrs() s
u
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Junio C Hamano
Make su
r
e
lockfiles are unlocke
d
w
h
e
n dying on SIGP
I
PE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
u
nio C Hamano
Merge branch 'm
a
i
n
t' t
o
s
y
n
c
w
ith GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
H
amano
G
IT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
u
n
i
o C Hamano
fas
t
-import: make tagger i
n
forma
t
ion opt
i
on
a
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Merge branch 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Junio
C
Hamano
Merge g
i
t
:
//r
e
po
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
com
b
ine-diff
.
c: use strbuf_
r
e
adlink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Haman
o
builtin-blame
.
c: use
strbuf_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C H
a
mano
make_abs
o
l
u
t
e_
p
ath(): check bounds
w
hen seeing an
o
verlong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gitwe
b
: do no
t
run "g
i
t diff"
that
i
s
Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Haman
o
GIT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
G
I
T
1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
H
amano
GIT
1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C Hamano
gitweb: do not run "git diff" that
i
s Porce
l
a
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
Merge branc
h
'
c
b/maint-merge-r
e
c
u
rsive-fix' i
n
to cb
.
.
.
commit
|
commitdiff
|
tree
2008-12-15
Jun
i
o
C Hamano
merge-recursive: do not clobber u
n
tr
a
cked wo
r
king tree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
pager: do
n
ot
dup
2
stderr if it is alread
y
red
i
rected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Juni
o
C Ha
m
a
n
o
git
-
show: do not segfault when
s
h
o
wing
a
bad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio
C
H
a
m
ano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Jun
i
o C Hamano
Merge branch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Fix t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ham
a
no
Me
r
ge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Docum
e
n
t
"gi
t
-reset --merge"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
read
-
c
ache
.
c
:
typofix in c
o
mment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ham
a
no
b
u
ilt
i
n-checko
u
t
.
c: check error
r
eturn f
r
om read_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Point "stale" 1
.
6
.
0
.
5
d
ocumentation from
t
he
main git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C
Hamano
Revert
"git
-
s
ta
s
h: use git re
v
-
p
arse -q"
commit
|
commitdiff
|
tree
2008-12-07
J
u
nio C Ha
m
ano
U
p
dat
e
d
r
a
f
t release notes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
J
u
nio C Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
C Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
u
n
io C
Hama
n
o
Update
d
r
a
f
t release notes to
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
M
erge branch
'jc/
a
m-options'
commit
|
commitdiff
|
tree
2008-12-06
Jun
i
o C Hamano
git-a
m
: ren
a
me apply_
o
p
t_extra file to apply-opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
Hamano
Test that git-am does not lose -C
/
-p/--w
h
ite
s
pace options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-a
m
:
propa
g
a
t
e --3way opti
o
ns as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am
:
p
ropagate -C<n>,
-
p<
n
> opt
i
o
n
s
a
s w
e
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
Hamano
git
-
am
--whitespace: do not lose th
e
command line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
Merg
e
branch 'dm
/
s
vn
-
remote'
commit
|
commitdiff
|
tree
2008-12-04
Junio C
H
amano
Merge branc
h
'
j
n/gitweb-utf8'
commit
|
commitdiff
|
tree
2008-12-03
Junio
C Hamano
Merge b
r
anch 'jc/
r
m-
i
-t-a'
commit
|
commitdiff
|
tree
2008-12-03
Junio C
H
ama
n
o
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-12-03
Junio C H
a
mano
I
n
stall gi
t
-stage in e
x
ec-pat
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio
C Hamano
M
erge br
a
n
c
h '
j
k
/
maint
-
co
m
mit-v
-
str
i
p
'
into m
a
int
commit
|
commitdiff
|
tree
2008-12-03
J
unio C Ham
a
no
Merge branch
'
bc/mai
n
t-keep-
p
ack' into mai
n
t
commit
|
commitdiff
|
tree
2008-12-03
Junio
C
Ha
m
ano
Merge branch 'js
/
mingw-rename-fix' i
n
to
main
t
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-02
Junio C
H
amano
Makefile: introduce N
O
_PTH
R
E
ADS
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
Merge branch 'gb/gitweb-featur
e
'
commit
|
commitdiff
|
tree
2008-12-02
Jun
i
o C
H
amano
Merge git:/
/
re
p
o
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-12-02
Junio C
H
amano
Mer
g
e
g
it://g
i
t
.
kernel
.
org/pub/scm
/
gitk/
g
i
tk
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
GIT 1
.
6
.
1-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
I
nclude git-gui--ask
p
ass i
n
git-gui RPM p
a
ckag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Juni
o
C
Hamano
Merge g
i
t://gi
t
.
kernel
.
org/pub
/
sc
m
/g
i
tk/gitk
commit
|
commitdiff
|
tree
2008-12-01
J
unio C Hamano
Merge g
i
t://repo
.
or
.
cz
/
git-g
u
i
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
s
e
nd-email: do not reverse th
e
command line
a
r
guments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Ju
n
i
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-01
Junio C Ham
a
no
Upd
a
t
e
d
raf
t
release notes to 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Merge bran
c
h
'
st/maint-tag' into main
t
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Merge
b
ran
c
h 'mk/maint
-
cg
-
p
u
sh' into maint
commit
|
commitdiff
|
tree
2008-12-01
Ju
n
io
C
H
a
mano
g
i
tweb
:
rename
g
itw
e
b_chec
k
_fe
a
t
ure to gitweb_
g
e
t_featu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
g
i
twe
b
:
f
ix 'cta
g
s
'
f
ea
t
ure check and
o
t
h
ers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio
C Ha
m
a
no
git add --inte
n
t-t
o
-add: do no
t
l
e
t an empty blob be
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-29
Ju
n
io C Hamano
git add --intent-
t
o
-
a
dd: fix rem
o
val of cache
d
emptin
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-29
Junio C
H
aman
o
builtin-r
m
.
c: explain and clarify the "local change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-29
Ju
n
i
o C
H
a
m
a
n
o
M
erge br
a
n
ch 'nd/na
r
row' (ea
r
l
y part) in
t
o
j
c/add-i-t
-
a
commit
|
commitdiff
|
tree
2008-11-28
Junio C Ham
a
no
Merge b
r
anc
h
'cc/bisect-
s
kip'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Haman
o
M
e
rge branch 'js
/
mingw-rename-f
i
x
'
commit
|
commitdiff
|
tree
next