repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-merge: add --ff and --no-ff options
2007-09-24
Lars H
j
e
mli
git-me
r
ge: add --
f
f and -
-
no-
f
f options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-24
Lars
Hjemli
git-merge: add support for --commit
a
nd --no-squ
a
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-24
Lars Hjem
l
i
git-m
e
rge: add support
for
branch
.
<name>
.
mergeoptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-24
L
ars Hje
m
li
git-merge: refactor option parsing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-24
Lars Hje
m
li
git-me
r
ge: fix
fa
u
lty SQUAS
H
_
M
SG
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-24
Lars
H
jemli
Ad
d
test-script for git-merge por
c
elain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-24
Jun
i
o C Hamano
Merge
br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-09-24
J
u
nio C Hamano
M
e
rge
branch 'maint'
of git:
/
/linux-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-09-24
Eric Wong
git-svn: don't a
t
te
m
pt to sp
a
w
n pager if
we d
o
n't want
o
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-23
D
a
vid
K
astrup
Supplant the "while c
a
se
.
.
.
b
reak
;; e
s
a
c"
idio
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-22
Da
v
id Brow
n
Detect
exec bit in
m
ore ca
s
es
.
commit
|
commitdiff
|
tree
2007-09-21
Matt Kraai
C
onjugate "s
e
arc
h
" correc
t
ly
i
n
t
he
git-prune-packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-21
Matt Kraa
i
Mo
v
e
the
p
aragraph s
p
e
cifying wh
e
re
t
he
.
idx
a
n
d
.
pack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-21
Junio C Hamano
Document
a
tion/git-lost-found
.
txt: drop un
n
e
cessar
i
ly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-20
Christian Couder
rev-list -
-
bisect: Fix best ==
N
ULL case
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-19
Junio C Hamano
M
e
rge branc
h
'maint' to sync
w
ith 1
.
5
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-19
Ju
n
io C Hama
n
o
GIT 1
.
5
.
3
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-19
J
u
nio C Hamano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-09-19
Väinö
Järvelä
Fixed update-hook example al
l
ow-users format
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-19
Eric Wong
D
ocumen
t
ation/git
-
svn: updated design
philos
o
p
h
y n
o
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
J
u
nio C Hama
n
o
t/t4
0
1
4
: test
"am -3" with
m
ode-only change
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
D
a
vid Kastrup
git-
c
ommit
.
sh:
S
h
e
l
l script cleanup
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Dmitry Potapov
p
r
eserv
e
execu
t
able bi
t
s
in zip archi
v
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Pierre Habouzit
Fix lapsus in buil
t
in-apply
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
J
eff King
g
it-push
:
doc
u
mentation and tests
f
or
p
ushing
only
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Matthi
a
s
Urlichs
git-svnimport: Us
e
s
e
parate ar
g
umen
t
s in th
e
pipe for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Jeff King
contrib/fast-impor
t
: add perl version
o
f
sim
p
l
e
exampl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
N
g
u
yen Thai Ngoc Duy
contrib/fast-i
m
por
t
: ad
d
simple s
h
ell exa
m
ple
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
C
hris
t
i
a
n
Cou
d
er
rev-li
s
t --bisect:
B
i
section "distance" clean up
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Chr
i
s
tian
C
ouder
r
e
v
-
l
i
st --bisect
:
Move so
m
e bisec
t
io
n
code into bes
t
_bisection
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Chris
t
i
a
n Cou
d
e
r
rev
-
l
i
s
t
--bi
s
ect:
Move finding bisect
i
on into do_find_bisec
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
Merge branc
h
'cr/reset'
commit
|
commitdiff
|
tree
2007-09-18
Junio C Ham
a
n
o
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-09-18
Junio C Hamano
Document ls-fi
l
es -
-
with-tree=<tree-ish>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
J
u
n
i
o C Hamano
git-commit: partia
l
commit of paths
only removed from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Junio C H
a
mano
git-comm
i
t: Al
l
ow partial commit of file removal
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-18
Junio C
Hamano
Merge
b
ranch 'jc/grep-c' in
t
o maint
commit
|
commitdiff
|
tree
2007-09-18
Ju
n
io C Haman
o
Merge branch 'maint
'
of git://r
e
p
o
.
o
r
.
cz/g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-09-18
Junio C
Ha
m
an
o
send
-
email: make messag
e
-id generation a bit
m
ore robu
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-17
J
u
n
i
o
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-09-17
J
.
Bruce
Fi
e
lds
git-ap
p
ly: fix whi
t
espa
c
e stripping
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-17
J
o
hann
e
s Schindeli
n
apply --in
d
ex-i
n
fo: fall ba
c
k to curren
t
index fo
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-16
J
unio
C Hamano
Merge bra
n
ch
'
maint'
o
f
g
it://
l
inux-nfs
.
or
g
/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-09-15
Johannes
S
c
h
indelin
r
evis
i
on
w
alker: --c
h
erry-pick is a
limited operation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-15
J
u
nio C Ha
m
a
n
o
g
i
t
-
sh-setup:
t
ypofi
x
i
n
co
m
m
e
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-15
J
unio
C Ha
m
ano
Merge branch '
j
s/rem
o
te'
commit
|
commitdiff
|
tree
2007-09-15
J
u
nio C Hamano
Merge branch 'js/tag'
commit
|
commitdiff
|
tree
2007-09-15
Junio C Hamano
Merge branch 'lh/sv
n
-f
i
rst-p
a
r
ent'
commit
|
commitdiff
|
tree
2007-09-15
Junio
C
Hama
n
o
Merge bran
c
h 'n
p
/delta'
commit
|
commitdiff
|
tree
2007-09-15
J
u
nio C Ha
m
ano
builtin-pack-objects
.
c: avoid bogus g
c
c warnings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-15
Junio C
H
a
mano
M
erge
b
ranch 'jc/pack'
commit
|
commitdiff
|
tree
2007-09-15
Junio
C Hamano
M
erg
e
branch
'
d
k/di
f
f-delta'
commit
|
commitdiff
|
tree
2007-09-15
Junio C Ham
a
no
M
e
rge bra
n
ch 'j
c
/
p
artial-
r
emove'
commit
|
commitdiff
|
tree
2007-09-14
Junio C Ha
m
ano
Document ls-files
--with
-
tree=<t
r
ee-ish>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Junio
C
Hamano
git-commit: partial com
m
it of pat
h
s only removed from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
Merge
branch 'jc/
g
re
p
-c'
commit
|
commitdiff
|
tree
2007-09-14
Junio
C
Ham
a
no
Split grep
a
r
gum
e
nts
i
n a way that does not requir
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
Documentation/git-con
f
i
g
.
t
x
t: AsciiDo
c
tweak t
o
avo
i
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
B
e
no
i
t Sig
o
ure
Add tes
t
to c
h
eck recent fix to "git add
-u"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Jari Aalto
Documentation/git-archive
.
txt: a co
u
pl
e
o
f clarification
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Linus Torvalds
Fix the rename dete
c
tion limit chec
k
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Ju
n
i
o
C Hamano
diff
-
-
n
o-index: do not
for
g
et t
o
r
un di
f
f
_
set
u
p_do
n
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
J
u
nio C Hamano
Me
r
ge branch
'jc/cachetree' into cr/reset
commit
|
commitdiff
|
tree
2007-09-14
J
u
nio C Hamano
Simpli
f
y cache API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Ha
m
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
git-
f
ormat-patch --in-reply-t
o
: accept <messag
e
@id
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
git
-
add -u: do not barf on typ
e
change
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Ulrik Sv
e
rd
r
up
Remove duplicate note ab
o
ut
r
e
moving commits
w
ith gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Ge
r
rit Pape
g
i
t-clone: impro
v
e
e
rro
r
m
e
ssage
i
f
c
url progra
m
is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Alex
a
ndre Julliard
git
.
el
:
Al
l
ow the
a
dd and remove commands to be applied
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Alexandre Julliard
git
.
el: Allow select
i
ng w
h
eth
e
r t
o
d
i
splay uptodate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Alexandre Ju
l
l
iard
git
.
el: Keep the status buff
e
r sorted
by filename
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
A
lexandre Jull
i
ard
hooks--upd
a
te: Expl
i
ci
t
ly che
c
k for
a
ll ze
r
os
f
o
r
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-14
Junio C Hamano
A
n
ad
d
itional te
s
t
f
or "g
i
t
-
re
s
et
-
- path"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Junio C Hamano
git-
c
ommi
t
:
Allow par
t
i
a
l commit of file removal
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Carlos Rica
Mak
e
"git re
s
et"
a builtin
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Carlos Rica
Move
make_ca
c
he_e
n
t
ry() fr
o
m me
r
ge-recursive
.
c in
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Carlos Rica
A
dd t
e
sts for documented features
of "git reset"
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
J
unio C Hamano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-09-12
Junio C Hamano
Merge branch 's
p
/m
a
int-no-thin' int
o
m
aint
commit
|
commitdiff
|
tree
2007-09-12
Rob
e
rt Boone
Define
NO_
M
EMMEM of FreeBSD
a
s it lacks t
h
e function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Nicol
a
s Pitre
threaded delta search: proper locking
for
cache a
c
count
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Jean-Luc
H
er
r
e
n
s
t
ash: end
i
nd
e
x commit log with a
n
ewline
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Dmitry
V
.
Levin
git
-
commit:
D
isallow ame
n
d if it is
g
oing to
p
roduce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
David Kastrup
g
i
t-se
n
d-email
.
perl: Add an
g
le brackets to I
n
-Reply
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-12
Rams
a
y Jones
Fix a
t
est failur
e
(t9500-*
.
sh) on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Nicolas Pitre
threaded delta se
a
r
ch
:
add
p
a
ck
.
threads co
n
f
ig variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Nicolas Pitre
fix threaded delta search
l
ocking
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Jun
i
o C Ham
a
no
M
erge bra
n
ch 'rs/archive'
commit
|
commitdiff
|
tree
2007-09-10
Junio C
Hamano
archiv
e
-
l
eakfix for forma
t
_subst
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Junio C Hamano
M
erge bra
n
ch 'sp/ma
i
nt-no-t
h
in'
commit
|
commitdiff
|
tree
2007-09-10
Shawn O
.
Pearce
Make
--no-thin the default in
gi
t
-push to save se
r
ver
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Nicolas P
i
tre
fix doc for -
-
c
ompr
e
ssion argument to
pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Nicolas Pitre
threaded
d
elta search: speci
f
y numb
e
r of th
r
eads at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Ni
c
olas
Pit
r
e
threade
d
d
e
lta
searc
h
: bet
t
er c
h
unck split point
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Nicolas Pitre
t
h
r
eaded
d
e
l
ta
s
earch: refi
n
e work allocatio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
Carlos Rica
git-tag -s must fail if gp
g
canno
t
sign the
tag
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
David Kastr
u
p
diff-delta
.
c: Rationali
z
e
culling of hash buc
k
ets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-10
D
a
vid
Kast
r
up
diff-delta
.
c: pack t
h
e in
d
ex st
r
ucture
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2007-09-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next