repo.or.cz
/
git
/
ericb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jl/diff-submodule-ignore'
2010-01-27
Junio C
Hama
n
o
Merge b
r
anch
'
j
l/
d
iff-submo
d
ule-ignore'
commit
|
commitdiff
|
tree
2010-01-27
Junio C Hamano
work around
a
n obnoxious bash "safety fea
t
ure" on OpenBSD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-25
J
unio C Hamano
Merge br
a
n
ch
'
jc/fix
-
tree-wal
k
'
commit
|
commitdiff
|
tree
2010-01-24
J
unio C Hama
n
o
Merge bra
n
ch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-01-24
Junio C
Hamano
Merge branc
h
'maint' of git://
g
it
.
spearce
.
or
g
/git-
g
ui
.
.
.
commit
|
commitdiff
|
tree
2010-01-24
Junio C Hamano
Mer
g
e br
a
nch 'doc-style/for
-
next' of git://re
p
o
.
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-24
Junio C Hamano
pull: re-fi
x
command
line gen
e
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-24
Junio C Ham
a
n
o
Make ce_uptodate()
t
rustworthy again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-24
Junio
C
H
amano
rebase -i:
E
x
p
ort
G
I
T
_A
U
THOR_* variable
s
e
xplic
i
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-23
Jun
i
o
C Haman
o
Merge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Update draft rel
e
a
s
e notes
t
o 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-23
Junio
C Hamano
M
e
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-01-23
Junio C H
a
mano
Merge branch 'jc
/
branch-d'
commit
|
commitdiff
|
tree
2010-01-23
Juni
o
C
Haman
o
M
erge
b
ranch 'il/rev-g
l
o
b
'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C H
a
mano
Merge branch 'js/refer-u
p
s
tream'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ham
a
no
Merg
e
branch
'j
l
/
s
ubmodule
-
d
i
f
f
'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge bran
c
h 'il
/
remote
-
updates'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C
Hamano
M
erge bra
n
c
h
'il/branch-set
-
upstream'
commit
|
commitdiff
|
tree
2010-01-23
Ju
n
io C Hamano
M
e
rge br
a
nch 'jc/maint-li
m
it-note-output'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ham
a
no
Merge
b
ranch 'n
d
/
l
s-fil
e
s-s
p
a
r
se-fix
'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
ign
o
re duplicated
s
lashes
in
ma
k
e_re
l
ative_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
J
u
n
i
o C Hamano
git-mv:
f
ix
moving more than o
n
e sou
r
ce to a sin
g
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
merge-recursive: do not return NULL only to cause s
e
gf
a
u
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
H
amano
Fix "log
-
-
on
e
l
i
ne" not to
show n
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io C
H
aman
o
conflict-marker-size: add test and do
c
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Juni
o
C Hama
n
o
Up
d
at
e
draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hama
n
o
M
e
rge br
a
n
c
h '
b
w/cvsi
m
port
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Me
r
ge bran
c
h 'jc/checkou
t
-mer
g
e-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Mer
g
e
br
a
nch
'ag/pat
c
h
-h
e
ader-
v
erif
y
'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C Hamano
Merge branch 'jc/conflict-marker-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge
branch 'a
g
/m
a
i
n
t-apply-to
o
-l
a
rge
-
p'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch
'
ap/merg
e
-
b
ac
k
end-opts'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge bran
c
h
'
nd/status-partial-
r
efresh'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Me
r
ge
r
emote branch
'r
e
m
otes/trast-doc/for-
n
ext'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Me
r
ge branch
'
j
h
/notes
'
(early part)
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
Merge bra
n
ch 'jc/maint-refresh-index-is-o
p
ti
o
nal-
f
or
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
F
i
x "l
o
g" family not to be
too
agres
s
i
v
e abou
t
showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Haman
o
Merge
b
ranch 'rr/core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hama
n
o
Merge branch 'jc/c
a
che-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merg
e
branch 'j
s
/exec-error-rep
o
rt'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Mer
g
e branch 'jc/ls-files-ignored-pathspec'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge
b
r
anch
'jc/
g
r
e
p-lookah
e
a
d
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Merge
b
ranch 'jc/maint-s
t
rbuf-ad
d
-fix-doubling'
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
M
e
rge branch
'
mm/confl
i
ct-advice'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge b
r
an
c
h
'
da/difftool'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ham
a
n
o
Merge branch 'mh/re
b
ase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Merge branch 'n
s
/re
b
ase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
J
unio
C H
a
m
ano
Merge b
r
anch 'm
h
/rebase-fixup' (earl
y
part)
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
Ham
a
no
Mer
g
e
b
r
an
c
h
'i
l
/pus
h
-se
t
-upstream'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
M
er
g
e
branch
'
jk/warn-aut
h
or-commi
t
te
r
-af
t
er-commit'
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ham
a
no
Merge bran
c
h 'j
c
/
i
dent'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Merge
b
r
a
n
ch 'tr/h
t
t
p
-push-ref
-
status'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Me
r
g
e
branch 'bk/fix-relative-git
d
ir-file'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
Merg
e
b
ranch 's
d
/cd-p
-
show-to
p
lev
e
l'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
amano
M
erg
e
branch 'jc/symbol-
s
tat
i
c'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
date
.
c: mark file
-
lo
c
al funct
i
on static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio C
H
amano
Sync with
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hama
n
o
Gi
t
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Hamano
Merge branch 'bg/
m
aint-remo
t
e
-up
d
ate-default' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
i
o C
H
a
mano
Merge b
r
anch 'sb
/
m
aint-octo
p
us' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Me
r
ge b
r
anch 'bg/maint-a
d
d-all-d
o
c' into maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o
C
Hamano
Merge branch 'main
t
-1
.
6
.
5
' int
o
maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
amano
Gi
t
1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge b
r
an
c
h 'jk/maint-
1
.
6
.
5
-re
s
et-hard' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Haman
o
Mer
g
e branch 'tr/main
t
-1
.
6
.
5-bash-prompt
-
s
how-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'dp
/
maint-1
.
6
.
5-fast-
i
mport-
n
o
n-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Ju
n
io
C
Ham
a
n
o
Me
r
ge branch 'jm/mai
n
t-1
.
6
.
5-grep-NUL-te
r
minate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Teach @{upstr
e
am} syntax to strb
u
f_branchanm
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
t1506
:
more test for @{upstream} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix "che
c
kout A
.
.
.
" synonym for
"
c
h
eckout A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C Ham
a
no
status:
don't require the reposito
r
y
t
o be
wri
t
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Ham
a
no
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Ham
a
n
o
Merge bra
n
ch
'maint-1
.
6
.
4' i
n
t
o maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
J
u
nio C Hamano
Merge br
a
n
ch 'm
a
int-1
.
6
.
3
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch
'
m
aint-1
.
6
.
2
' into main
t
-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
u
ni
o
C Hamano
Mer
g
e commi
t
'v1
.
6
.
4
.
4
-8
-
g8de6518' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
F
i
x m
i
s-backport
of t7
0
02
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
a
n
o
U
p
date draf
t
release notes
to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Up
d
ate draft rel
e
ase notes to
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
M
e
rge branch 'dp/ma
i
nt-1
.
6
.
5-fast-impo
r
t-n
o
n-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
ma
n
o
Mer
g
e
b
r
a
n
ch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hamano
Merge b
r
an
c
h
'
p
c
/u
n
inter
e
s
t
ing-su
b
mo
d
u
l
e-di
s
appear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Haman
o
Merge bran
c
h '
n
d/include-termios-for-os
o
l
'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
Merge branch 'js/wind
o
ws'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jm
/
m
a
int-1
.
6
.
5-grep-N
U
L-terminate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c: remove unused functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
object
.
c:
r
e
move unus
e
d funct
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Document that merg
e
s
t
rat
e
gies can now
take their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C
H
a
ma
n
o
Make "subtree" part mor
e
orthogonal to the
rest
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
ni
o
C
H
amano
pull: Fix parsing o
f
-
X
<
option
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Update draft release no
t
es to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio
C Ham
a
n
o
Merge branch 'tc/te
s
t-
l
ocate-htt
p
d'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Merge branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge bran
c
h '
j
n/mak
e
file'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
n
o
Merge
b
ranch 'j
c
/maint-1
.
6
.
1-ch
e
ckout-m-custom-
m
er
g
e'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Ha
m
ano
Merge
br
a
n
c
h 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge br
a
nch 'tc/s
m
art-
h
ttp-restrict'
commit
|
commitdiff
|
tree
next