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
unpack-trees.c: prepare for looking ahead in the index
2010-01-07
Jun
i
o C Hamano
unp
a
c
k-trees
.
c:
p
r
epa
r
e for looking ahead
in the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Aggres
s
ive
three
-
way merge: fix D/F case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ha
m
ano
traverse_tre
e
s():
handle D/F confl
i
ct ca
s
e sa
n
ely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Ham
a
no
mo
r
e D/
F
confli
c
t tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hama
n
o
tests: move conv
e
nience regexp to match obj
e
c
t names
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-23
J
u
nio C Haman
o
Git 1
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-22
Junio C H
a
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Juni
o
C Hamano
G
it 1
.
6
.
6-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-20
Junio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hama
n
o
G
it
1
.
6
.
6
-
rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C Hama
n
o
Merge
branch 'maint
'
to sy
n
c
w
ith 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Junio
C Hamano
Git 1
.
6
.
5
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
wor
k
tree: don't se
g
fault w
i
t
h an absolu
t
e
p
athspec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release
Notes for
1
.
6
.
6
t
o remov
e
old
b
u
gf
i
xes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-11
Junio C
H
amano
Sync with
1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1
.
6
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Junio
C
H
amano
Fi
x
archive forma
t
with -- on
the command line
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Remove po
s
t-upload-hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-10
J
unio C Hamano
G
it 1
.
6
.
6-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
M
e
rge git://gi
t
.
ker
n
el
.
org/pub/scm/gitk
/
g
i
tk
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C
H
a
mano
Upd
a
te dra
f
t r
e
lease notes to 1
.
6
.
6 bef
o
re -rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-09
J
u
nio C Hamano
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2009-12-09
J
unio C Hamano
Me
r
g
e br
a
nch 'm
m
/
m
aint
-
merge-ff-er
r
or-message-f
i
x'
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Ju
n
io C Ha
m
a
no
Mer
g
e
branc
h
'jn/main
t
-pull-rebase-error-
m
essage'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-09
Junio C H
a
ma
n
o
Merge
branc
h
'jk/mai
n
t-add-p-delete
-
f
i
x' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Ha
m
ano
Merg
e
git://gi
t
.
b
og
o
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent
"
gi
t
m
e
r
ge <msg> HEAD <
c
o
m
m
it>
.
.
.
" de
p
recation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync wi
t
h 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-05
J
u
nio C
Hamano
Gi
t
1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Prep
a
re for 1
.
6
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o
C Hama
n
o
Me
r
g
e
br
a
nch
'
uk/maint-short
l
og-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
Hamano
Merge branch 'fc/maint-format-
p
atch-p
a
thspec
-
da
s
hes
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Me
r
ge
branch 'ap/maint-merge-
s
trat
e
gy-list-fix'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jc/maint
-
am-keep'
into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Ha
m
a
n
o
Merge b
r
an
c
h 'rs/work-around-grep
-
opt-insa
n
ity' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hamano
Merge bra
n
ch '
r
j/
m
a
i
nt-
c
ygwin-c
o
unt
-
o
b
jects'
int
o
maint
commit
|
commitdiff
|
tree
2009-12-03
Juni
o
C
H
a
mano
Merge bra
n
ch 'mm/maint-h
i
nt
-
faile
d
-m
e
rge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Ha
m
a
no
Merge
branch 'th/mai
n
t
-rem
o
te-u
p
date-help-string'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio
C
H
amano
M
erge branch 'rj/
m
aint-t
9
700' into maint
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
Merge bra
n
ch 'ls/maint-mailin
f
o-no-inbod
y
' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hama
n
o
Me
r
ge b
r
anch 'mo/maint
-
crlf-d
o
c' into
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branc
h
'th/remote-
u
s
ag
e
' in
t
o
m
aint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Hama
n
o
Merge
b
ranch 'pb/maint-use-c
u
stom-p
e
r
l'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/con
f
ig-pathname-tilde-
e
xpa
n
d' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
am
a
no
Merge branch 'bc/gre
p
-i-F'
into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C
H
amano
M
erge branch '
j
k/ma
i
nt-
b
r
e
a
k
-rena
m
e-
r
educe-memory'
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
J
unio C Hamano
M
e
rge bra
n
c
h 'r
j
/maint-sim
p
lify-cygwin-makef
i
le' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Ham
a
no
Merge b
r
a
n
ch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio
C
Ham
a
no
Merge br
a
nch 'np/maint-s
i
deband-fav
o
r-status' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2009-12-03
Jun
i
o C Hamano
Docu
m
entatio
n
: xmlto 0
.
0
.
18
d
oes n
o
t kn
o
w --str
i
ngpa
r
am
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge in 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Ju
n
io C H
a
m
a
n
o
Git 1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-03
Junio
C Hamano
Uncon
d
itiona
l
l
y
set man
.
base
.
u
r
l
.
f
o
r
.
relative
.
links
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1
.
6
.
6
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C
H
amano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
J
u
n
io
C
Ham
a
no
Prepare for
1
.
6
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio C H
a
m
ano
merge: do not add standard message when mess
a
g
e is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-02
Junio
C Hamano
Do not misi
d
enti
f
y "g
i
t
m
e
rge foo
H
EAD" a
s
an old-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Junio C H
a
mano
Upd
a
te
d
raft release
notes
t
o
1
.
6
.
6 before -rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Juni
o
C Hamano
Me
r
ge b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Ha
m
ano
Merge branch
'
jc/deprecate-old-
s
yntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io
C Hamano
git-mer
g
e: a
deprec
a
tion notice of th
e
a
n
c
ient
co
m
mand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-01
Ju
n
io C Hamano
Merge branch 'bw/remote-get-ref-stat
e
s-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Haman
o
M
erge branch
'jn/g
i
tweb-blam
e
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/maint-format-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio C Hamano
Merge
b
r
an
c
h
'mm/m
a
int-merge
-
f
f-error-messa
g
e-fix'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o C Hamano
M
erge br
a
nc
h
'ap/mai
n
t-
m
erge-strategy-list-fix
'
commit
|
commitdiff
|
tree
2009-11-30
Junio C H
a
mano
Merge branch
'
j
c/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
J
u
nio
C
Hama
n
o
Merge branch 'cc/b
i
s
e
ct-doc'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
io C
H
am
a
no
Merg
e
branch 'em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
a
mano
Merge br
a
nch
'
jc/maili
n
fo-remove-brac
k
ets'
commit
|
commitdiff
|
tree
2009-11-30
Jun
i
o
C H
a
m
ano
Me
r
ge
bra
n
ch 'fc/send
-
emai
l
-e
n
velope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge br
a
n
ch 'uk/
m
aint-
s
hortlog-encodin
g
'
commit
|
commitdiff
|
tree
2009-11-30
Ju
n
i
o
C Hamano
M
e
rge
b
ranch 'ns/sen
d
-email-no-chain-r
e
ply-to'
commit
|
commitdiff
|
tree
2009-11-30
J
uni
o
C Ha
m
ano
M
e
rge branch
'jc
/
maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C
H
ama
n
o
Me
r
ge branch 'bw/diff-c
o
lor-hunk-heade
r
'
commit
|
commitdiff
|
tree
2009-11-28
Junio
C
Hamano
Update dr
a
ft release
n
ote
s
to 1
.
6
.
6 before
m
erging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-28
Junio
C H
a
m
a
n
o
emit_line()
:
do
n
'
t e
m
it an empt
y
<SET><RESET>
f
o
l
lowed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Ju
n
io C Hama
n
o
Rem
o
ve
d
e
a
d code from "git am"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-27
Junio
C
Ham
a
no
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Ha
m
a
no
b
uiltin
-
apply
.
c: pay at
t
ention to -p<n>
w
hen det
e
rminin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge bra
n
ch 'rs/work
-
around-grep-opt
-
insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branc
h
'rj
/
ma
i
nt-cyg
w
in-count-o
b
ject
s
'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Haman
o
M
e
rge b
r
a
n
ch '
r
s/col
o
r-escape-ha
s
-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
J
unio
C
Hamano
Merge
b
ran
c
h
'bg/apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C
H
amano
M
e
rge branch '
m
m/maint-hint-
f
ailed-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Mer
g
e branch 'jc/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Jun
i
o C Hamano
Merge bra
n
ch
'
mr/gitweb-snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'cc/rep
l
ace'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Ju
n
io C Ha
m
ano
Protect scrip
t
ed Porc
e
lains from
G
REP_OPTI
O
NS insanity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
J
u
nio
C H
a
mano
Add t
r
ivia
l
tests
f
o
r --stdin optio
n
to log
family
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'bg/fetch-multi'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Ham
a
no
Git v1
.
6
.
6-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-11-23
Junio C
H
ama
n
o
Merge b
r
a
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
M
erge git://git
.
bo
g
omips
.
org
/
g
it-svn
commit
|
commitdiff
|
tree
2009-11-23
Jun
i
o C Hamano
Me
r
g
e
b
ra
n
ch 'th/m
a
int-remote-update-help-strin
g
'
commit
|
commitdiff
|
tree
2009-11-23
Juni
o
C Hamano
Merge bra
n
c
h
'jn/faster
-
complet
i
on-
s
tar
t
up'
commit
|
commitdiff
|
tree
next