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
status: show worktree status of conflicted paths separately
2009-08-07
J
u
n
io C Hamano
s
t
atu
s
: show worktree status of
c
o
nflicted paths separately
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-08-06
Junio C
H
a
ma
n
o
w
t-
s
tatus
.
c: rework
t
he
w
ay changes to
the
index
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-08-05
Jun
i
o
C
Hama
n
o
d
i
ff-inde
x
: keep the orig
i
n
a
l index intact
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-08-05
Junio C Haman
o
diff-index: report unmerged new entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-29
Junio C Hamano
re
q
uest-pul
l
: optionally sho
w
a pa
t
c
h
as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-29
Jun
i
o C
Hamano
Merge
b
r
anc
h
'hv/cvsps-t
e
sts'
commit
|
commitdiff
|
tree
2009-07-29
Junio C Haman
o
St
a
r
t
1
.
6
.
5 cy
c
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-29
Junio C
H
amano
GIT 1
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-29
Juni
o
C Ham
a
no
Sy
n
c with 1
.
6
.
3
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-29
Junio C
Ha
m
ano
GIT
1
.
6
.
3
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-26
Junio C Hamano
Merge branch 'gp/maint-rebase-p
-
onto'
commit
|
commitdiff
|
tree
2009-07-26
Junio
C Hamano
Merge branch
'en/fast-export
'
commit
|
commitdiff
|
tree
2009-07-26
Junio C Hamano
GIT 1
.
6
.
4-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-26
Junio C Hamano
Merg
e
gi
t
://git
.
bogom
i
ps
.
o
rg/git-svn
commit
|
commitdiff
|
tree
2009-07-25
Jun
i
o C Haman
o
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-07-25
Junio C
H
amano
t8005: Nobody writ
e
s
Rus
s
ian in shift_jis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-25
Jun
i
o C Hamano
Merge
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-07-25
Ju
n
io C
Ham
a
no
Fix severe brea
k
a
ge in "git-apply --whitespace=fix"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-25
J
u
nio C H
a
man
o
U
p
date
rel
e
ase notes for
1
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-25
J
u
nio C H
a
m
an
o
Merge bra
n
ch 'js/
m
ai
n
t-graft-
u
nhide-true-p
a
ren
t
s'
commit
|
commitdiff
|
tree
2009-07-25
Junio C Hamano
Merge
branch 'av/m
a
int-co
n
fig-reader'
commit
|
commitdiff
|
tree
2009-07-25
J
unio C Hama
n
o
M
e
rge br
a
nc
h
'j
k
/ma
i
nt-send-email-ali
a
s-loop'
commit
|
commitdiff
|
tree
2009-07-24
Junio C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-07-24
Junio C Ham
a
n
o
SunOS grep does not
un
d
er
s
tand -C<n>
n
or -e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-23
Junio
C
Haman
o
do_one
_
ref():
nu
l
l_sha1 che
c
k
i
s
n
ot abou
t
b
roken ref
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-23
Juni
o
C Hamano
Merg
e
bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-07-22
Juni
o
C
Ha
m
ano
diff
--cc:
a
l
o
s
t line
at
th
e
beginning of the file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-22
J
u
ni
o
C Hamano
combi
n
e-diff
.
c
:
fix performance problem when fo
l
ding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-19
Junio C
H
amano
U
p
dates to draft release notes to
1
.
6
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-19
J
unio C
Hamano
push: do no
t
give big war
n
ing when no prefere
n
ce is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-18
Ju
n
io C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2009-07-18
Junio C Haman
o
ch
e
ck
o
ut -f: deal with a D/F conflict entry correct
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-15
Junio C H
a
mano
Revert
"maili
n
f
o
:
Remove only
one
set of square brackets"
commit
|
commitdiff
|
tree
2009-07-11
Junio
C
Ha
m
ano
Merge branch
'
l
t
/dir-c
l
eanup'
commit
|
commitdiff
|
tree
2009-07-11
Jun
i
o
C
Hamano
M
erge branch 'ae/maint-mailinfo-
r
m
-only-one-patch-mar
k
er'
commit
|
commitdiff
|
tree
2009-07-11
J
u
nio C Hamano
Make
f
ile: keep "
g
i
t" when bindir is exec
d
ir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-07-09
Junio
C
Ham
a
no
Me
r
g
e
bra
n
ch
'
ld/push-
p
orcelain-ou
t
put-format'
commit
|
commitdiff
|
tree
2009-07-09
Junio C Hamano
Merge branch 'gb/gitw
e
b-avatar'
commit
|
commitdiff
|
tree
2009-07-09
Junio
C
Haman
o
Mer
g
e
branch 'ml/
h
tt
p
'
commit
|
commitdiff
|
tree
2009-07-09
Junio
C
Hamano
Merge b
r
a
nch
'
rs/grep-p'
commit
|
commitdiff
|
tree
2009-07-09
Juni
o
C
Haman
o
Merge branch 'js/run-comma
n
d-
u
pdates'
(
early part)
commit
|
commitdiff
|
tree
2009-07-08
Junio C Hamano
Merg
e
b
r
anch
'maint'
commit
|
commitdiff
|
tree
2009-07-08
J
u
nio C Hamano
Merg
e
br
a
nch 'cb/maint-fetch-refspec
-
wo-dst'
i
nto
maint
commit
|
commitdiff
|
tree
2009-07-08
Jun
i
o
C
Hamano
Merge branch 'cf/maint-remote-uploadpack-useco
n
fig
.
.
.
commit
|
commitdiff
|
tree
2009-07-06
Ju
n
io C
Hamano
Merge branc
h
'tr/die_errno'
commit
|
commitdiff
|
tree
2009-07-06
Ju
n
io
C Hamano
Me
r
ge branch 'cb/maint-fe
t
ch-refspec-wo-
d
st'
commit
|
commitdiff
|
tree
2009-07-06
Junio C
H
amano
Merge branch 'sb/show-ref-
p
arse-options'
commit
|
commitdiff
|
tree
2009-07-06
Jun
i
o C
H
amano
Merge branch 'gb/am-fo
r
e
i
g
n'
commit
|
commitdiff
|
tree
2009-07-06
Jun
i
o C Hamano
Merge
branch
'
jk/use
-
our-
r
eg
e
xp'
commit
|
commitdiff
|
tree
2009-07-06
J
unio C Hamano
Merge branch
'
uk/rev-p
a
rse-pa
r
se-opt'
commit
|
commitdiff
|
tree
2009-07-02
Jun
i
o
C Hamano
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2009-07-02
Junio
C
Hama
n
o
Merge branch 'js/dae
m
o
n-log'
commit
|
commitdiff
|
tree
2009-07-02
Junio C Ham
a
no
Merge b
r
anc
h
'cf/maint-
r
emote-uploa
d
p
a
ck-useconfig
.
.
.
commit
|
commitdiff
|
tree
2009-07-02
Junio C Haman
o
Merge
b
r
anch
'sb/quiet-p
o
r
c
elains'
commit
|
commitdiff
|
tree
2009-07-02
J
u
nio C Hama
n
o
Merge br
a
nch 'ne/ma
i
nt-1
.
6
.
0-dif
f
-tree-t-r-show-directory'
commit
|
commitdiff
|
tree
2009-07-02
Junio C Hamano
M
e
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-06-30
Junio C
Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2009-06-30
Junio
C
Hamano
request-pull:
r
eally disab
l
e page
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-28
Junio C Hamano
Mer
g
e
gi
t
:/
/
git
.
bogomips
.
org/gi
t
-svn
commit
|
commitdiff
|
tree
2009-06-27
Junio C Hamano
Merge branch 'pb/
s
en
d
-email-cccmd-fix
'
commit
|
commitdiff
|
tree
2009-06-27
J
u
nio
C
Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2009-06-27
J
u
n
io
C
Hama
n
o
d
i
e_
e
rrno(): doubl
e
% in strerror()
o
utput just in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Junio
C
H
a
man
o
Merg
e
branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2009-06-22
Junio C Hamano
Merge branch 'sb/maint-
1
.
6
.
0
-
a
d
d-conf
i
g-fix' in
t
o main
t
commit
|
commitdiff
|
tree
2009-06-22
Jun
i
o C Hama
n
o
Sync with
1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
Junio C
Ham
a
no
G
I
T 1
.
6
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C Hamano
Merge branch 'ak
/
m
a
int-f
o
r-ea
c
h-ref-
n
o-look
u
p'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-06-22
Junio C
Hamano
Merge
branch
'rc/maint-http-local-slot-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2009-06-22
Junio C H
a
mano
Merge
b
ranc
h
'cb/m
a
i
nt
-
no-double-mer
g
e' into maint
commit
|
commitdiff
|
tree
2009-06-22
J
u
nio C H
a
mano
Me
r
ge branch 'mn/m
a
i
nt-iconv
-
au
t
oconf'
i
nto m
a
int
commit
|
commitdiff
|
tree
2009-06-22
Junio
C
Hamano
Me
r
g
e branch 'lt
/
mai
n
t-unsigned-l
e
ft-shift' into maint
commit
|
commitdiff
|
tree
2009-06-22
J
unio C
H
amano
Merge branch
'pb
/
main
t
-1
.
6
.
2
-
u
s
e
rdiff-fix
'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2009-06-21
Junio C Haman
o
at
t
ribut
e
: w
h
ites
p
ace s
e
t to true de
t
ects a
l
l errors
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
J
u
nio C Hamano
t3505: fix
a
bu
s
e of
t
es
t
_exp
e
ct_code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-06-21
Junio
C
H
amano
M
erg
e
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2009-06-21
Junio C Ha
m
ano
Merge branch 'maint-
1
.
6
.
2
' into maint
commit
|
commitdiff
|
tree
2009-06-21
Junio C
H
a
m
ano
Merge b
r
an
c
h 'maint-1
.
6
.
1' into mai
n
t-1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
M
e
rge branch 'mai
n
t-1
.
6
.
0
'
into main
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge br
a
nch 'ph/s
u
bmodule-reb
a
se'
commit
|
commitdiff
|
tree
2009-06-21
J
un
i
o
C
H
amano
Merge b
r
a
n
ch 'jc/cache-tree'
commit
|
commitdiff
|
tree
2009-06-21
J
unio C
H
amano
Merge branc
h
'mg/p
u
shurl
'
commit
|
commitdiff
|
tree
2009-06-21
J
unio C Hamano
Me
r
g
e bran
c
h
'mn/maint-iconv-autoconf'
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hama
n
o
Me
r
ge branc
h
'sb/pull-rebase'
commit
|
commitdiff
|
tree
2009-06-21
Ju
n
io C Hamano
Me
r
ge branch 'pb/send-email-
c
ccmd-fix'
commit
|
commitdiff
|
tree
2009-06-21
J
unio C Ham
a
no
Merge
b
ranch 'pb/maint
-
1
.
6
.
2-userdiff-fix
'
commit
|
commitdiff
|
tree
2009-06-21
Junio C Hamano
Merge
b
r
a
n
ch 's
b
/maint-1
.
6
.
0
-
add-config-fix'
commit
|
commitdiff
|
tree
2009-06-21
Junio C Ha
m
a
n
o
M
e
rge
b
r
a
n
ch 'lt/maint-u
n
signe
d
-l
e
ft-shift'
commit
|
commitdiff
|
tree
2009-06-20
Ju
n
i
o C Ha
m
ano
Me
r
ge git://git
.
kernel
.
o
r
g
/pub/scm/
g
itk
/
gitk
commit
|
commitdiff
|
tree
2009-06-18
Junio C Hamano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2009-06-18
Jun
i
o C
H
am
a
n
o
Mer
g
e b
r
anch 'sb/p
a
rse-options-integer'
commit
|
commitdiff
|
tree
2009-06-18
Juni
o
C Hama
n
o
M
e
rge branch
'ak/maint-for-each-
r
ef-no-lookup'
commit
|
commitdiff
|
tree
2009-06-14
Junio C H
a
mano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2009-06-14
J
u
nio C Hamano
Mer
g
e branch 'mai
n
t-
1
.
6
.
2
' into
m
aint
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
M
e
rge branch
'
main
t
-1
.
6
.
1
'
into maint
-
1
.
6
.
2
commit
|
commitdiff
|
tree
2009-06-14
Junio C Hamano
Merge bran
c
h 'maint
-
1
.
6
.
0'
i
nto maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-06-13
Junio C Hamano
Merge branch 'mh/fix-send-em
a
il-thread
e
d'
commit
|
commitdiff
|
tree
2009-06-13
Junio C Hamano
Merge branch 'rc
/
http-push'
commit
|
commitdiff
|
tree
2009-06-13
Jun
i
o
C
Hamano
Merge bran
c
h
'cc/bisec
t
' (early
part)
commit
|
commitdiff
|
tree
2009-06-13
Junio C Hamano
Merg
e
branch 'rc/m
a
int
-
h
t
tp-local
-
s
lot-fix'
commit
|
commitdiff
|
tree
2009-06-13
Ju
n
i
o
C H
a
mano
Merge bran
c
h 'sp/msysgit'
commit
|
commitdiff
|
tree
next