repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: describe new cherry-pick --ff option
2010-03-07
Chr
i
s
tian Coude
r
Documentation: describe new cherry-p
i
ck --ff opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Ch
r
istia
n
C
o
uder
cherry-
p
ick
:
add
test
s
for new --f
f
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
reve
r
t
: add --ff opti
o
n to a
l
low
f
ast forward wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
b
uiltin/merge: make
checkout_fast_
f
orward() non
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
p
arse
-
options:
a
dd parse_options_
c
oncat()
t
o concat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C H
a
mano
Update draf
t
release
n
otes to 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-05
J
u
nio C H
a
mano
Merge branch 'jn/gitweb
-
con
f
ig-er
r
o
r-die' into m
a
i
n
t
commit
|
commitdiff
|
tree
2010-03-05
Junio
C Hamano
Merge
b
ra
n
ch 'jn
/
maint-fix-p
a
ger' int
o
m
a
in
t
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
M
erge br
a
nch 'tr/mai
n
t
-
cherry-
p
ick-l
i
st' into maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
M
erge
b
ranc
h
'
l
d/maint
-
diff-quiet-w'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge b
r
anc
h
'rs
/
o
p
tim-text-wr
a
p' int
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Ha
m
a
no
Merge branch 'dp/rea
d
-not-mmap-small-
l
o
o
se-object'
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Ju
n
i
o
C H
a
m
a
n
o
Mer
g
e
br
a
nch 'np/compress-loose-
o
bject-memsave' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-05
Junio
C
Ham
a
n
o
Merge bran
c
h 'jc/ma
i
nt-status-preload'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2010-03-05
Jun
i
o C H
a
mano
Merg
e
b
r
anch 'gf/mai
n
t-sh-setup-non
g
it-ok
'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-05
Junio C
H
amano
Merge branch 'cc/maint-bisect
-
pa
t
hs' in
t
o
maint
commit
|
commitdiff
|
tree
2010-03-05
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
6' into
m
aint
commit
|
commitdiff
|
tree
2010-03-05
Junio C Hamano
Merge branch 'maint-1
.
6
.
5' int
o
mai
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-05
Mich
a
l Sojka
R
emove
extr
a
'-' from gi
t
-am(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Ju
n
io C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-03
Junio C
Hamano
Merge branch 'jh/maint-submodu
l
e-status-
i
n-voi
d
' (ea
r
ly
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
Jeff King
submodule summary: d
o
no
t
shift
a
non-existent positional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Jun
i
o C Hamano
Start prepari
n
g for 1
.
7
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merge bra
n
c
h 'tc/main
t
-transport
-
ls-remot
e
-with-
v
o
id
.
.
.
commit
|
commitdiff
|
tree
2010-03-03
J
u
ni
o
C
H
a
m
a
no
Merge branch
'hm/
m
ai
n
t-ima
p
-s
e
nd-crlf' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2010-03-03
Junio
C
H
a
ma
n
o
Merge b
r
anch 'sp/ma
i
nt-push-sideband' into m
a
int
commit
|
commitdiff
|
tree
2010-03-03
Junio C Hamano
Merg
e
b
r
anch 'jc/maint-fix-tes
t
-perm' into maint
commit
|
commitdiff
|
tree
2010-03-03
Juni
o
C
H
amano
Merg
e
br
a
n
ch
'
n
p
/
fast-i
m
port-idx-
v
2'
i
n
to
m
a
int
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hama
n
o
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-03-02
J
u
nio C Hamano
Merge bran
c
h 'j
n
/maint-fix-pa
g
er'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
m
a
no
Mer
g
e branch 'ml/encod
e
-heade
r
-
r
e
f
act
o
r'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Ha
m
ano
Merge
br
a
n
c
h '
j
n/
g
itweb-config-error-die
'
commit
|
commitdiff
|
tree
2010-03-02
Jun
i
o C Haman
o
Merge branch 'jc/for
-
each-ref'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Haman
o
Merge branch 'ld/maint-diff-quiet-w'
commit
|
commitdiff
|
tree
2010-03-02
Juni
o
C Hamano
Merge branch 'tr/mai
n
t-cherry-pick-list'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
e
rge branch '
r
s/
o
ptim-text-wrap'
commit
|
commitdiff
|
tree
2010-03-02
J
unio C Hamano
Me
r
ge bra
n
ch 'm
l
/se
n
d-pa
c
k-tr
a
nsp
o
rt-refa
c
tor'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
M
erg
e
branch 'ml/fill-mm-r
e
fa
c
t
o
r'
commit
|
commitdiff
|
tree
2010-03-02
Junio C
Hama
n
o
Merge b
r
anch
'
ml
/
connect-refactor'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merg
e
bran
c
h 'np/
c
ompress-loose-object-memsav
e
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
man
o
Me
r
ge br
a
nch 'dp/
r
ead-not-mmap-small-loose-ob
j
ect'
commit
|
commitdiff
|
tree
2010-03-02
J
uni
o
C Hamano
Merge branch 'jn/ma
k
edepend'
commit
|
commitdiff
|
tree
2010-03-02
J
u
ni
o
C Ha
m
ano
Merge bran
c
h 'jc/mai
n
t-status-prel
o
ad'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merge br
a
nch 'gf/maint
-
sh
-
setup-nongit-ok'
commit
|
commitdiff
|
tree
2010-03-02
J
u
n
io
C H
a
m
ano
Merg
e
b
r
anc
h
'jh/maint-submodule-stat
u
s-in-void
'
commit
|
commitdiff
|
tree
2010-03-02
Junio C H
a
mano
Mer
g
e b
r
anch
'hm/im
a
p-se
n
d-
c
ram-md5'
commit
|
commitdiff
|
tree
2010-03-02
Junio C Hamano
Merg
e
branch 'ml/color-when'
commit
|
commitdiff
|
tree
2010-03-02
Ju
n
io C H
a
m
a
n
o
M
e
r
g
e
br
a
nch
'
a
c/cvsimport
-
revisio
n
-mapping'
commit
|
commitdiff
|
tree
2010-03-02
J
u
n
io C Ha
m
a
no
Me
r
ge branch 'j
c
/grep-autho
r
-all-
m
atch-impli
c
i
t
'
commit
|
commitdiff
|
tree
2010-03-02
Frank
Li
fallback S
S
H_ASKPASS when GIT
_
ASKP
A
S
S not s
e
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Ja
k
u
b Narebski
g
i
t
we
b
:
Fix pro
j
ect-specific featur
e
override
b
ehavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-02
Sy
l
vain
R
abot
gitweb multipl
e
project roots
d
o
c
u
m
entati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-01
J
unio C Hamano
Merge
b
ranch 'cc/maint-bisect-paths'
commit
|
commitdiff
|
tree
2010-03-01
Christi
a
n
Cou
d
er
bisect: e
r
ror out when passing bad path para
m
eters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-28
Jun
i
o
C Hamano
Git 1
.
7
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Mark
L
odato
R
e
move reference to GREP_CO
L
ORS from do
c
umentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Nieder
Makefile: clarif
y
definition of TEST_OBJS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-28
Markus Heidelb
e
rg
s
h
a
1
_name: fix
s
egfault caused by invalid i
n
d
ex
a
ccess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-26
Junio C Ham
a
no
Merg
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-02-26
Junio C
Hamano
Merge b
r
a
nc
h
'
m
ain
t
-1
.
6
.
6
'
into maint
commit
|
commitdiff
|
tree
2010-02-25
Johan
n
es
S
ixt
Windows: re
d
irect
f[
r
e]open("/dev/null")
to f[re]open
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
nes Six
t
t3301-notes: insert
a shban
g
li
n
e in
.
/fake_editor
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Junio
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-02-24
Mat
t
Kraai
commit: qu
o
te the user name in the ex
a
m
ple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-24
Junio
C
Hamano
M
erge
branch 'ml/m
a
int-
g
r
e
p-
d
oc' in
t
o maint
commit
|
commitdiff
|
tree
2010-02-23
Junio C Hama
n
o
M
e
rge branch
'maint
'
commit
|
commitdiff
|
tree
2010-02-23
Jonathan N
i
e
der
am: remove rebase-app
l
y directory before g
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
B
e
r
t Wesarg
rerere: fix memory leak if rere
r
e i
m
ages c
a
n't be read
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
B
ert Wesarg
Documentat
i
on: mention conflict marker size argume
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-23
Nicolas Pitre
move enc
o
d
e
_
i
n_pack_object_header() t
o
a
bet
t
e
r
place
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Jo
n
athan Nieder
tests: Fix race condit
i
on in
t
7
006-pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Nico
l
as P
i
tre
s
h
a
1_fil
e
:
b
e p
a
ranoi
d
when creati
n
g
loose objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-22
Lar
r
y
D
'Anna
git-
d
iff: add a test f
o
r git d
i
ff --quiet -w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
J
u
n
io C H
a
mano
Merg
e
branc
h
'
m
l/mai
n
t
-
g
r
ep-
d
o
c
'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Merge branch 'tc/maint-transport
-
ls-r
e
mot
e
-with-void'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Ham
a
no
Merge branch 'hm/maint-imap-s
e
nd-crlf'
commit
|
commitdiff
|
tree
2010-02-21
Junio C Hamano
Merg
e
branch 'sp/push
-
s
ideband
'
commit
|
commitdiff
|
tree
2010-02-21
Junio C H
a
ma
n
o
Merg
e
br
a
n
c
h 'jc/checkou
t
-detached'
commit
|
commitdiff
|
tree
2010-02-21
Junio
C Hamano
M
e
rge b
r
a
nch 'jc/maint-fix-test-perm'
commit
|
commitdiff
|
tree
2010-02-21
Ju
n
io C
Hamano
Merge
b
ranch 'jn
/
makefile-script-lib'
commit
|
commitdiff
|
tree
2010-02-21
Ju
n
io C Ha
m
a
n
o
Mer
g
e branch 'mv/req
u
est-pu
l
l
-modernize'
commit
|
commitdiff
|
tree
2010-02-21
Dmitry Potapo
v
hash-object: don't use
mma
p
() for small files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
N
i
c
olas Pitre
sh
a
1_file:
d
on't ma
l
loc the who
l
e
c
ompressed result
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-21
Jo
n
athan Nieder
t7006-pager: if
s
tdo
u
t
i
s not a
t
erm
i
n
a
l, make a new one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Junio
C Hamano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
cherry_pick_l
i
st:
quit ear
l
y if one
s
i
d
e i
s
em
p
ty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
J
onathan Ni
e
de
r
tests: Add test
s
for automatic
u
s
e
o
f
pager
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René Scharfe
utf8
.
c: speculatively assu
m
e
utf-
8
i
n
strbuf_add_wrapped_t
e
xt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
R
ené Scharfe
utf8
.
c
: remove s
t
rbuf_write()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Re
n
é Sch
a
rfe
utf8
.
c
:
r
e
move print_spaces()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
René S
c
harfe
utf8
.
c: remov
e
p
r
int_wra
p
ped_tex
t
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
E
v
a
n
Powers
g
i
t-p4:
f
ix bug in syml
i
nk ha
n
dling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Thomas Ras
t
t1450:
f
ix testca
s
es
t
hat were w
r
ongly
expecting failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-20
Jacob Hel
w
ig
Docu
m
en
t
ation: Fix indentatio
n
problem in git-commit(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
J
u
nio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-02-19
Junio C Hamano
Merge bra
n
ch 'jk/maint
-
rmdi
r
-
fix' into maint
commit
|
commitdiff
|
tree
2010-02-19
Jeff King
r
m
: fix bug in recu
r
sive subdirecto
r
y
r
emo
v
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-02-19
M
a
rk Lodato
Add an
o
ption
a
l
argument for -
-
c
o
lor o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next