repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
reset: add test cases for "--keep" option
2010-01-25
Junio C
H
a
mano
Merge branch 'jc/fix-
t
ree-wa
l
k
'
commit
|
commitdiff
|
tree
2010-01-24
Junio C Hamano
Merge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2010-01-24
J
u
nio C Hamano
M
e
r
ge branch 'mai
n
t' of git://git
.
s
pearce
.
org/git-gui
.
.
.
commit
|
commitdiff
|
tree
2010-01-24
Junio
C
Hamano
Merge
b
ranch 'doc-
s
ty
l
e
/f
o
r
-next' of git
:
//repo
.
o
r
.
.
.
commit
|
commitdiff
|
tree
2010-01-24
Junio C Haman
o
pu
l
l: re-fix c
o
mma
n
d
l
ine
g
eneration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-24
J
unio C
H
amano
reb
a
s
e
-i: Export GIT_AUTHO
R
_* variables expl
i
cit
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge
g
i
t
://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio C Hamano
Up
d
ate draft rel
e
a
s
e n
o
t
e
s t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-23
Junio
C Haman
o
Merge b
r
anc
h
'
m
aint'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Hamano
Merge branc
h
'jc/branch-d'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
H
amano
Merge b
r
an
c
h 'il/rev-glob'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C
Hamano
Merge
b
ranch 'js/ref
e
r-up
s
trea
m
'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C Ha
m
a
n
o
Merg
e
br
a
nch 'jl
/
submodul
e
-diff'
commit
|
commitdiff
|
tree
2010-01-23
Junio C
Ham
a
no
M
e
rge bra
n
ch 'il/
r
emote-
u
pdates'
commit
|
commitdiff
|
tree
2010-01-23
J
u
nio
C Hamano
M
e
r
g
e branch 'il/branch
-
set-upstream
'
commit
|
commitdiff
|
tree
2010-01-23
Junio
C
H
ama
n
o
Merge branch 'jc/maint-limit-n
o
te-output'
commit
|
commitdiff
|
tree
2010-01-23
Junio C Ha
m
ano
Merg
e
branch 'nd/ls-files-sp
a
rse-f
i
x
'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hama
n
o
ign
o
re
du
p
licated slash
e
s
in make_relative_path()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C Ham
a
no
git-mv: fix
m
o
v
ing more
t
han one sour
c
e
to a single
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-22
Junio
C
Hamano
Merge b
r
an
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-01-22
Junio C Hamano
m
e
r
g
e-recursive: do not
r
eturn NULL onl
y
to caus
e
segfaul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio
C Ham
a
no
Fix "log --oneline" not t
o
show notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
conflict-marker-
s
ize
:
add test and docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
U
pdat
e
draft
r
elease notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-21
Jun
i
o
C
H
a
mano
Me
r
ge branch 'bw/cvsimport'
commit
|
commitdiff
|
tree
2010-01-21
Junio C
Hamano
M
e
rg
e
br
a
nch 'jc/ch
e
ckout-mer
g
e-base'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
m
a
no
Merg
e
b
r
anch 'ag/
p
atch-header-verify'
commit
|
commitdiff
|
tree
2010-01-21
Junio C H
a
mano
Merge branch
'jc/conflic
t
-
m
arke
r
-size'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hama
n
o
Merge branch 'ag/maint-apply-too-
l
arge-p'
commit
|
commitdiff
|
tree
2010-01-21
J
u
nio C
H
am
a
n
o
M
e
rge
branch 'ap/merge
-
back
e
nd-opt
s
'
commit
|
commitdiff
|
tree
2010-01-21
Junio C Hamano
Merge branch 'nd/status-partial-refresh'
commit
|
commitdiff
|
tree
2010-01-21
Ju
n
io
C
Hamano
Merge remote branch 'r
e
motes/
t
rast-
d
o
c/for-
n
ext
'
commit
|
commitdiff
|
tree
2010-01-21
J
uni
o
C Haman
o
M
erge branch 'jh/notes'
(
early par
t
)
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Hamano
Merge
b
r
anch
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2010-01-21
Junio
C
Hamano
Merge bra
n
ch 'jc/
m
aint-
r
ef
r
esh
-
index-is-optional-for
.
.
.
commit
|
commitdiff
|
tree
2010-01-21
J
unio C Ha
m
a
n
o
Fix "lo
g
" family not to be too agressive about showing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
i
o C Ha
m
ano
Merge branch
'
rr
/
core-tutorial'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merge b
r
anch
'
jc
/
cache-unmerge'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
m
ano
Mer
g
e
branch 'js/exec-error-
r
e
p
ort'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merge bran
c
h 'jc/ls-files-ignored
-
pathsp
e
c
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C
H
amano
Merge branch 'jc
/
g
rep-
l
ookahead
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hama
n
o
Merge b
r
anch 'jc
/
maint-strbuf-add-fix-doubl
i
ng
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ha
m
ano
Merge branc
h
'mm
/
conflict-advic
e
'
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C Hamano
Merg
e
branch 'da/difftoo
l
'
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
m
a
no
Merge branch 'mh/rebase-fixup'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch 'ns/rebase-auto-squash'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merg
e
branch 'mh/r
e
bas
e
-f
i
xup'
(
ea
r
ly part)
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge branch 'il/pus
h
-set-up
s
t
r
e
a
m'
commit
|
commitdiff
|
tree
2010-01-20
J
u
n
io C
Hamano
Merge branch 'j
k
/warn-aut
h
or
-
comm
i
t
te
r
-
aft
e
r-c
o
mmit'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branch
'
j
c/ident
'
commit
|
commitdiff
|
tree
2010-01-20
J
unio C H
a
mano
M
erge
b
ranch 'tr/http-push-ref-status'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Merge branc
h
'bk/fix-relative-
g
itdir-file'
commit
|
commitdiff
|
tree
2010-01-20
Junio C H
a
mano
Merge b
r
anch 'sd/cd
-
p-show-toplevel'
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge branch 'jc/symbol
-
st
a
tic'
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
date
.
c: m
a
rk file-
l
ocal
f
unc
t
ion st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Hamano
Sync with 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Git 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
M
erge branch 'bg/maint-remote-update-def
a
ult' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Ha
m
ano
Merge
b
ranch 'sb/m
a
i
n
t-oct
o
pus'
i
nto maint
commit
|
commitdiff
|
tree
2010-01-20
Jun
i
o C H
a
m
ano
Me
r
ge
b
r
anch 'bg
/
ma
i
nt-add-al
l
-doc' into maint
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Hamano
Merge
branch 'm
a
in
t
-1
.
6
.
5' into maint
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
no
Git 1
.
6
.
5
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Mer
g
e
b
ranch 'jk/maint
-
1
.
6
.
5-reset-hard' into main
t
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
H
a
mano
Merge
b
ranch 'tr/
m
ain
t
-1
.
6
.
5
-bash-p
r
ompt-show-s
u
bmodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hama
n
o
Merg
e
branch 'dp/maint-1
.
6
.
5
-
fast-import-no
n
-co
m
mit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Merge branch
'jm
/
maint-1
.
6
.
5-g
r
e
p
-NUL-t
e
rminate'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C
Ha
m
a
n
o
Tea
c
h @{upstream} syntax to strb
u
f_b
r
anchanme()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C
H
a
mano
t1
5
06: mo
r
e test for @{upstr
e
am} syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
Fix
"
checkout A
.
.
.
" synonym for "che
c
kout
A
.
.
.
HEAD
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Juni
o
C Hamano
status:
d
on't require the
repository to be writable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
Merge
b
ranch 'maint-1
.
6
.
4' int
o
maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint-1
.
6
.
3
' into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
maint-1
.
6
.
2'
into maint-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge commit
'
v
1
.
6
.
4
.
4-8-g8de
6
518' i
n
t
o
mai
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C
H
am
a
no
Fi
x
mis-ba
c
kp
o
rt of t
7
002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
n
o
Update
d
raft
release
notes t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C Hamano
Update d
r
af
t
rele
a
se no
t
es to 1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o
C Hamano
Merge b
r
an
c
h 'dp/maint-
1
.
6
.
5
-fast-import-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ha
m
ano
M
e
rge branc
h
'jc
/
re
r
ere'
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io
C Hamano
Merge branch
'
pc/uninterest
i
ng-submodule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C H
a
mano
Me
r
ge br
a
nch 'nd/include-termios-for-
o
sol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
ma
n
o
M
e
rge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
branch 'jm/maint-1
.
6
.
5-gr
e
p-NUL
-
terminate' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
H
amano
sym
l
i
nks
.
c: remo
v
e unused
f
unction
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
object
.
c: remove unused f
u
nctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
io C Hamano
Docu
m
ent tha
t
merge strategies can now
t
a
k
e their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io C Haman
o
Make "subtree"
p
art mo
r
e orthogonal to the rest
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
pull:
Fix parsing of -X<
o
ption>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
un
i
o C Ha
m
an
o
U
pdate d
r
af
t
release n
o
tes to
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
n
io
C
Hamano
Merge branch 'tc/tes
t
-locate-
h
ttpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
a
mano
Merge bran
c
h 'jh/commit-stat
u
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
M
erge branch
'jn/makefi
l
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge branch
'jc/maint-1
.
6
.
1-che
c
kou
t
-
m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
Merge branc
h
'
tc/c
l
one
-
v-prog
r
ess'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge branch 'tc/sma
r
t-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
Merge
b
r
anch 'j
k
/run-command-use-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ham
a
no
Merg
e
branch
'sr/gfi-opti
o
ns'
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Hamano
Update C
O
PYING w
i
th G
P
Lv2 with
n
ew FS
F
address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next