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-recursive: demonstrate an incorrect conflict with submodule
2010-04-04
Junio C Hama
n
o
GIT_ONE_F
I
LE
S
YSTEM:
fl
i
p th
e
def
a
ult to s
t
op at filesyste
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Junio C
Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
T
a
y
R
a
y
C
huan
pack-pro
t
ocol
.
txt
:
fix
p
kt-line
lengths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Tay Ra
y
Chuan
pack-pro
t
oc
o
l
.
txt:
f
ix spelling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jo
n
athan Nieder
Teach ma
i
linfo %< a
s
an alternative scissors mark
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C
H
a
mano
Merge
b
r
an
c
h 'mb/reb
a
se-i
-
n
o-ff'
commit
|
commitdiff
|
tree
2010-04-03
J
u
ni
o
C Hamano
Merge branch 'sp/mai
n
t
-
http-backe
n
d-die-
t
riggers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge b
r
anc
h
'rr/imap
-
send-unconfuse-from-line'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C
Hamano
Merge branch
'mg/use
-
default-abbre
v
-length
-
in-rev-list'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
M
e
rge bran
c
h
'
mg/
m
a
i
n
t-send-email-lazy-editor'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Me
r
g
e
branc
h
'rb/maint
-
pyth
o
n-path'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Haman
o
Merge branch 'jn/merge-diff3-label'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
Merge branch 'ef/cherry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
J
unio
C
Hamano
M
e
rge branc
h
'bw/t
e
mplate-tool-
b
uildcon
f
ig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hama
n
o
Merge branch 'mg/ma
i
lmap-update'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hama
n
o
M
erge bra
n
ch 'bc/t5505
-
fix
'
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
i
o
C Haman
o
Merge bran
c
h 'gh/main
t
-stash-show
-
er
r
or-message'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge bran
c
h 'r
s
/th
r
eade
d
-
g
rep-c
o
ntext
'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C H
a
mano
Merge branch 'bc/maint-daemon-sa
n
s-ss-fa
m
ily'
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
io C Hamano
Merge b
r
anch
'
bc/acl-t
e
s
t'
commit
|
commitdiff
|
tree
2010-04-03
J
u
nio C
Hamano
Merge branc
h
'ja/s
e
n
d-email-
e
hlo'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
M
e
rge
b
ranch
'd
o
/rebase-i-arbitrary'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Haman
o
Merge br
a
nch
'
ak
/
everyday-g
i
t'
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
atha
n
Nieder
M
a
k
efile: future-
p
roof Cygwin version check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Ma
r
kus Heidelberg
t7508: add a t
e
st for "
g
it sta
t
us" in a read-o
n
ly
r
epository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Markus Heidelberg
git sta
t
us: refresh the index if possible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Markus Heidelberg
t
7508: add test
f
or
"
git statu
s
"
refreshing t
h
e
inde
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
YONET
A
NI Tomokazu
Fi
x
_XOP
E
N_SOURCE
p
roblem
on
D
ragonFly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Mark Ra
d
a
gitweb: update
INST
A
LL to
u
s
e shor
t
er
m
ake
t
arget
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Ma
r
k Rada
gitweb: add document
a
tion to
I
N
STA
L
L regarding gitweb
.
js
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Mark Rad
a
instaweb: add
m
in
i
ficati
o
n a
w
areness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
M
a
rk Rada
G
itweb: ad
d
auto
c
onfigure suppo
r
t for minifiers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Mar
k
Rada
Gitweb:
add support for
mi
n
if
y
ing gitw
e
b
.
css
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Mar
k
Rada
G
itweb: add ignore and
clean rules for minifie
d
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Chris Webb
whites
p
ac
e
: add tab-in-in
d
e
n
t
err
o
r
c
l
a
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
w
hitespace: we
cannot "catch a
l
l errors kn
o
wn to gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Ma
r
kus Heidelberg
builtin/co
m
mit: remo
v
e unnecessary vari
a
ble definition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Markus Heidelberg
builtin/c
o
mmit:
fix duplicated
sentence i
n
a commen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
E
r
ic Raymon
d
Inte
g
rate ve
r
si
o
n
3
ciabot scripts i
n
to contrib/
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Jef
f
King
di
f
f:
a
v
o
i
d u
s
eless f
i
l
e
spec
populat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
diff
:
cache textcon
v
output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Jeff
K
i
ng
t
e
xtconv:
r
efactor
ca
l
l
s
to run_textconv
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
J
e
f
f
King
in
t
r
o
duc
e
no
t
es-cache
i
nterface
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Je
f
f Ki
n
g
ma
k
e commit_
t
ree a
library f
u
nction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
fix textconv leak
in emit_rewrite_d
i
ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
f
i
x
const-correctness of
w
rite_sha
1
_file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
E
r
i
c Blake
Makefi
l
e
:
u
p
date defaults fo
r
m
o
d
e
r
n
Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
S
c
o
tt
Chacon
Prompt
f
or
a
username when an HTTP request
4
01
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Chris
t
i
an
C
ouder
re
v
ert: add "--str
a
te
g
y" option
to c
h
oose m
e
r
g
e
strategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Christian Couder
merge: make function try_me
r
ge_co
m
m
and non stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Christian
Couder
m
erge: refacto
r
c
o
de tha
t
ca
l
ls
"git merge-STRATEGY"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Christian C
o
uder
r
e
ve
r
t
:
ref
a
ctor merge recursive code
i
n
t
o
its own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
C
h
ristian
C
ouder
re
v
ert
:
us
e
strb
u
f to
re
f
act
o
r the code that writ
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Sverr
e
R
abbelier
remo
t
e
-helpe
r
s
:
add testgit
h
elper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-01
Sverre Rabbelier
remote-helpers:
a
dd support
for an export command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Ham
a
no
Sync with 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C
H
amano
G
i
t
1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Hamano
M
e
rge
b
ra
n
c
h 'jc/maint-refs
-
dangli
n
g' into m
a
int
commit
|
commitdiff
|
tree
2010-03-31
Holger
Weiß
D
ocu
m
en
t
ation: sh
o
w-ref
<p
a
ttern>s are
o
ptional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holg
e
r Weiß
L
i
nk against libicon
v
on IRIX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Wei
ß
Don't redefine ht
o
nl an
d
ntohl on
b
ig-endian
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Narebski
g
itweb: git_get_pro
j
ect_co
n
fig requires
o
nly
$git_dir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Sverre
Rabbelier
remote-helpers: allow re
q
uesing
t
h
e
path to the
.
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Sverre Rabbelier
f
ast-impor
t
: always
crea
t
e
marks_
f
ile directories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
S
v
erre Rabbelier
clo
n
e:
a
lso con
f
ig
u
re url for bare clones
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Sverre Rab
b
elier
clone: pass
the remote name to
r
e
mote_g
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stępień
Updated the usage st
r
ing of git reset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Greg
B
a
con
Documentati
o
n
:
Clar
i
fy support for smart HTTP ba
c
kend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johan
n
es Sixt
Windows: fix uti
m
e
(
) for read-only f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
di
f
f: fix textco
n
v error zo
m
bies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Junio
C
Hamano
Mer
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-30
K
e
vin
B
alla
r
d
f
or
m
a
t
-patch: Squelch '
f
atal: N
o
t
a range
.
" error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Michae
l
J Gruber
refs
.
c:
Wri
t
e reflogs
f
or notes just
l
ike for branc
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Mic
h
ael J Gruber
t3301-notes: Test the creation of reflog entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Ian
W
ard C
o
m
f
o
r
t
RPM spec: include
b
ash completio
n
support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Upda
t
e draf
t
r
elease notes to
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
J
u
n
i
o C Hamano
Merge
b
ranch 'cc/cherry-pick-
f
f'
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Hamano
Merge
branch 'sb/no
t
es-parse-op
t
'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
David Aguila
r
Makefile: R
e
move usage of d
e
precated Python "has_key
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Thomas Ras
t
reb
a
s
e
-i: make p
o
s
t-rew
r
ite
w
ork
f
or 'edit'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C
H
amano
Prepare f
o
r
1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Hamano
Merge branch 'cp/a
d
d-u-p
a
thspe
c
' into maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C
H
am
a
no
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-29
J
unio C Hamano
t9350:
f
i
x c
a
reless
use
o
f
"cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Pete
r
Coll
i
n
gbourne
Rem
o
v
e a redundant errno test in a usage of remov
e
_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Peter Collin
g
bourn
e
Introd
u
c
e
r
e
m
ove_or_warn fun
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
P
e
ter Collingbourne
Implement
the rmd
i
r
_or_warn fu
n
ction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Pe
t
er Colli
n
g
b
o
u
rne
Generalise t
h
e
u
n
link_
o
r_war
n
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Alex Riesen
Use st
r
b
u
fs
instead
of open-coded string m
a
nipu
l
at
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Alex Riese
n
A
l
low passin
g
o
f con
f
i
g
u
r
ation parameter
s
in
th
e
com
m
and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Lars R
.
Dame
r
o
w
Add support for G
I
T_ONE_FILESYSTEM
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
D
avid Aguilar
difftool: Fix
'
--gui' when diff
.
guitool is
unconfi
g
ured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
S
v
erre Rab
b
elier
fast-ex
p
ort: don
'
t
seg
f
ault when
m
a
rks file cannot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chris Webb
imap
-
s
e
n
d
: suppre
s
s
w
a
r
nin
g
about cle
a
rtext password
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
L
a
r
s
R
.
Damerow
truncate
c
wd string b
e
fore printin
g
e
r
r
o
r message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Lars
R
.
Damerow
co
n
fig
.
c: remove static ke
y
w
ord fr
o
m
g
it_env_bool()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Michael J Gru
b
er
send-email: lazily assign edit
o
r
v
ariable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen Boyd
fmt-merge-msg: hide summary
o
ptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
Stephen
B
oyd
f
mt-merge-msg
:
r
e
move cus
t
o
m string_list imple
m
entation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next