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
merge: refactor code that calls "git merge-STRATEGY"
2010-03-07
Junio C Hamano
Merge br
a
n
c
h
'
g
b/main
t
-submod
u
le-e
n
v'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge br
a
nch 'ne/pack-loca
l
-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'mb/sh
o
rt
l
og-
n
ong
i
t-s
t
din'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merge
b
ranch 'jk/
m
aint-push-tracki
n
g-w
o
-
r
em
o
te'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'jc/fetc
h
-p
a
ram'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Me
r
ge branch 'il/loosen-remote-helper-names'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o
C Ha
m
a
n
o
Merge branch 'nd/root-git'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o
C Ham
a
no
Merge
branch 'js/r
u
ntim
e
-pr
e
fix-tra
c
e-not-w
a
rn'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C H
a
mano
Me
r
ge branch 'mm/mkstemps-mode-for-packfiles'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch
'jk
/
maint-add--intera
c
tive-delete
'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io
C Hamano
Merge b
r
anch
'
jc/
m
aint-fi
x
-mai
l
info-strip'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
aman
o
co
l
or: allow
m
ultiple a
t
trib
u
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hama
n
o
Sync
w
ith 1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
2010-03-07
Mark Lodato
A
dd GI
T
_COLOR_BOLD_* and GI
T
_CO
L
OR_BG_*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Git
1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Bert Wesarg
unset GREP_OPTI
O
NS in test-lib
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio
C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-07
Bjö
r
n Gustavsson
t3417: Add
te
s
t
cases for "rebase
-
-w
h
itespace=fix"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Björn Gustavsson
t4124: A
d
d additional tests of --whitespace=fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Björ
n
Gustavsson
apply
:
A
llow blank context li
n
es to
match beyon
d
EOF
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
B
j
örn
G
usta
v
s
son
apply: Remove
the quick re
j
ection test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Björn G
u
stavss
o
n
a
p
p
ly:
Don
'
t
u
nnec
e
ssarily update line l
e
ngths
i
n
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
C
h
ristian Couder
reset: disallow using --ke
e
p when the
r
e are unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Christian
C
ou
d
er
reset: disallow "res
e
t --keep"
o
u
t
sid
e
a
work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Christian C
o
uder
D
ocumentation: re
s
et: d
e
scribe
n
ew
"
-
-
ke
e
p" opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Matthieu Moy
stash: suggest
the correct c
o
m
mand line for unknown
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
S
t
e
p
hen Bo
y
d
t
7406: Fix
submodu
l
e init c
o
n
f
i
g tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
S
t
eve
n
Drake
Add 'git for
m
a
t
-patch --to='
option and
'
format
.
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
J
unio C
H
a
m
ano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Update draft
r
elease notes to 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hama
n
o
M
erge bra
n
ch 'jn
/
gitwe
b
-confi
g
-error-di
e
' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge bran
c
h 'jn/mai
n
t-
f
ix-pager' into maint
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C Ham
a
no
Merge branch
'tr/maint-cherry-pi
c
k-list' into
maint
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C Ham
a
no
Merge bra
n
ch 'ld/maint
-
diff-
q
uiet-w'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C Hamano
Merge bran
c
h 'rs/optim-text-
w
rap' into
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio
C Hamano
Merge
branc
h
'dp/
r
ead-not-mm
a
p
-
small-loo
s
e
-object'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge b
r
anch 'np
/
compress-loose-o
b
ject-m
e
m
save'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Me
r
g
e
bra
n
ch 'jc
/
maint-status-prel
o
ad'
into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C
H
a
ma
n
o
Merge br
a
nch 'gf/maint-sh-setup-nongit-ok' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-05
J
u
nio C Hamano
Merge branch 'cc/maint-bisect-paths' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Me
r
ge branch 'main
t
-1
.
6
.
6' into
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ham
a
n
o
Merge branch
'maint
-
1
.
6
.
5
' into main
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Frank
Li
git-core: Suppo
r
t retrieving passwords with GIT_ASK
P
ASS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
Michael
J
G
rub
e
r
Documentation: fix
a few typos in git-notes
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-05
Michal Sojka
Remove ext
r
a '-' from
git-am(1)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-04
Michael Wookey
ru
n
-command
.
c: fix build
war
n
in
g
s on Ubuntu
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
M
e
rge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2010-03-03
Junio
C
Hamano
Merge b
r
an
c
h
'
jh/maint-submodule-status-in
-
void'
(early
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jeff King
submo
d
ul
e
summary: do
n
ot shift a non-
e
xistent
positio
n
al
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Juni
o
C
H
a
mano
Start preparing
f
or 1
.
7
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Haman
o
Merge bran
c
h 't
c
/maint
-
transp
o
rt-ls-remote
-
with-
v
oid
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Juni
o
C Hamano
Merge
branch 'hm/maint
-
im
a
p-send-
c
rlf' into maint
commit
|
commitdiff
|
tree
2010-03-03
Junio
C Hamano
Merge branch 'sp/maint-p
u
sh-sid
e
ban
d
' into m
a
i
nt
commit
|
commitdiff
|
tree
2010-03-03
Junio C
H
amano
Mer
g
e branch
'jc/m
a
int-fix-test
-
p
erm' into maint
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge branch 'np/fast-import
-
idx-v
2
'
into maint
commit
|
commitdiff
|
tree
2010-03-03
Bert
Wesarg
merge
-
f
i
l
e:
a
d
d option to
s
elect un
i
on
merge f
a
vor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Bert Wesarg
merge-fi
l
e:
a
dd o
p
tion to specify the
m
arker size
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-03
Junio
C Hamano
wrap-f
o
r-bin: do n
o
t export an
empt
y
GIT_TEMPL
A
TE_
D
IR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Fran
k
Li
g
i
t
-s
v
n
:
Support ret
r
ieving passw
o
rds wit
h
GI
T
_ASKPASS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
er
g
e bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C
Hamano
Merge
b
ranch 'jn/maint-f
i
x
-
p
ag
e
r'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o
C Hamano
Merge branch 'ml/enco
d
e-
h
eader-
r
efactor'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C Ham
a
no
Merge b
r
a
n
ch 'jn/gitweb-config-error-d
i
e
'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io C Hamano
M
erge
br
a
n
ch 'jc/for-
e
ach-ref'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
rge br
a
nch '
l
d/maint-diff-quie
t
-w'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ham
a
no
M
erge branch 'tr/maint-cher
r
y-pick-list
'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hamano
Merge branch
'
rs/optim
-
text-wrap'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
rge branch 'm
l
/send-pac
k
-
t
ranspo
r
t-refactor'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merg
e
branch 'ml/f
i
ll-
m
m-ref
a
ctor'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
H
ama
n
o
Merge br
a
nch 'ml/conn
e
ct-refacto
r
'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Hamano
Mer
g
e
branch 'np/compress-loose-o
b
jec
t
-
m
em
s
ave'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge branc
h
'dp/re
a
d-not-m
m
ap-small-loose-object'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C
Ham
a
n
o
Merge branc
h
'jn/maked
e
pen
d
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Me
r
ge branch '
j
c/maint-s
t
atus-preload'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C
H
a
mano
Merge branch 'gf
/
ma
i
nt-sh-setu
p
-nongit-ok'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io C H
a
mano
Mer
g
e branch 'jh/maint-subm
o
d
u
le-sta
t
us-in-void'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
rge b
r
a
nch 'hm/imap-send-cram-md5
'
commit
|
commitdiff
|
tree
2010-03-02
Junio
C Hamano
Merge branch 'ml/color-whe
n
'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o
C
Hamano
Merge b
r
anch 'ac/cvsi
m
po
r
t-revision-m
a
pping'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hama
n
o
M
erge branc
h
'
j
c/grep-a
u
t
h
or-all
-
match
-
implicit'
commit
|
commitdiff
|
tree
2010-03-02
Frank Li
fallback SSH_ASK
P
A
SS when GIT_AS
K
PA
S
S not se
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Jakub Na
r
ebski
gitweb: Fix proj
e
ct
-
specific
feature overrid
e
b
e
havior
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Sylvain Rabot
gitweb mul
t
i
pl
e
pr
o
j
ect roots documentatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
refacto
r
merge flags into xm
p
a
r
am
_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Bert Wesarg
make union merge an xdl merge favor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
T
a
y R
a
y Chuan
remo
t
e-curl: init walker only when needed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray C
h
uan
remote-c
u
rl:
use http
_
fe
t
ch_ref() i
n
ste
a
d of walker
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray Chuan
h
t
tp: ini
t
a
nd c
l
eanup s
e
parately from http
-
walker
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray Chuan
http-walker:
c
leanup more thorough
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray Ch
u
an
http-push: rem
o
ve "|| 1" to enabl
e
verbose check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray
C
huan
t554[
0
1
]
-http-push: re
f
actor, add
n
on-ff tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-02
Tay Ray Chuan
t5
5
41-http-p
u
sh: check that ref is unch
a
nged for non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-01
Ju
n
io C Hamano
Merg
e
branch '
c
c
/maint-bisect-p
a
th
s
'
commit
|
commitdiff
|
tree
2010-03-01
Ch
r
isti
a
n Co
u
der
b
i
sect: err
o
r
ou
t
when passing bad path paramet
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Jun
i
o C Ha
m
ano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-02-28
Junio C Hama
n
o
Git
1
.
7
.
0
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Mark Lodato
Remove ref
e
rence
to GRE
P
_C
O
LORS from documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Stefan-W
.
Hahn
git-am
:
Add t
e
sts for
`
--
k
eep-
c
r`, `
-
-
n
o-keep-
c
r` and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
Stefan-W
.
H
ahn
git-am: A
d
d am
.
keep
c
r and --no-keep-cr to over
r
id
e
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-02-28
S
t
ef
a
n-W
.
Hahn
git-am: Add com
m
and line paramete
r
`--keep-cr` passing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next