repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Honor pull.{twohead,octopus} in git-merge.
2006-12-28
S
hawn
O
.
Pearce
Hono
r
pull
.
{twohead,octop
u
s} in git-
m
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Sha
w
n O
.
Pearce
Ensur
e
`
git-pull` f
a
i
ls if `git-merge`
f
ails
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Us
e
br
a
nch
names in
'
git-
r
ebase -m' conf
l
ict hun
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Hono
r
GIT_
R
E
F
LOG_ACTION in
git
-
rebase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn O
.
Pearce
Use G
I
T_REFLOG_ACTIO
N
environment vari
a
ble inste
a
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jakub Narebs
k
i
git
w
eb: Precompi
l
e CG
I
ro
u
tines for mod_perl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jakub Narebsk
i
gitw
e
b: Add mod_perl version st
r
in
g
to "genera
t
or"
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Junio C
Hamano
Merge br
a
nch 's
p
/gc'
commit
|
commitdiff
|
tree
2006-12-27
J
u
nio C Ham
a
no
Set
N
O_
M
MAP
for Cygwin by d
e
fault
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C
H
amano
Use 'repack -a -d -l' instead o
f
'r
e
pack -a -d' in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Robe
r
t F
i
tz
s
imons
gitweb: Re-enable
rev-
l
ist --parents
for p
a
rse
_
commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Qu
y
T
ont
h
a
t
git-send-ema
i
l
: d
e
fault
v
al
u
e for "From:" field
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
J
un
i
o
C Hamano
everyday:
r
epla
c
e
a f
e
w
'
p
r
une' and 'repack' with 'gc'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Shawn O
.
Pear
c
e
Create 'git gc' to perform
co
m
mon
m
aintenance operati
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
J
u
ni
o
C Hamano
git-r
e
fl
o
g: gc
.
* configuration and
d
ocu
m
entation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C
H
amano
r
e
re
r
e g
c
: honor configuration a
n
d document it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Ham
a
no
coun
t
-obj
e
c
t
s -v: show
n
u
m
ber of pa
c
ks as
w
ell
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
J
u
nio C Ha
m
a
n
o
Merge branch
'
jc/fsck-r
e
flog'
commit
|
commitdiff
|
tree
2006-12-27
J
u
nio C H
a
mano
e
v
e
ryday: update for v1
.
5
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
E
r
ic Won
g
g
i
t-svn:
dcommit sho
u
ld diff against the cu
r
rent HEAD
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eri
c
Wong
gi
t
-svn: quiet down te
s
ts
and fix some
unportable
s
he
l
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Andy Pa
r
kins
h
o
oks/commit-ms
g
: ad
d
exampl
e
t
o a
d
d Signed-off-
b
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
N
i
cola
s
Pitre
m
ove git-b
l
a
m
e
to its place in
.
giti
g
nore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicola
s
Pitre
Add git-
r
ef
l
og to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Haman
o
Docu
m
ent git-res
e
t <commi
t
> -
-
<paths>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
J
unio C Hamano
Document --numstat in git-apply a
n
d git-
d
iff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
show
-
branch -
-
r
e
f
l
o
g
:
ad
d
do
c
u
m
entation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pitr
e
a
dd
.
mailmap for git-shortlog output wit
h
t
h
e g
i
t r
e
po
s
itory
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Juni
o
C
Hamano
GIT
v
1
.
5
.
0 previ
e
w
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hamano
Mer
g
e
branch '
j
c/bm'
commit
|
commitdiff
|
tree
2006-12-26
Junio C
H
ama
n
o
M
erge branch 'rf/w
e
b'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Ha
m
ano
g
it-add
-
f
:
a
l
low addi
n
g
o
t
h
er
w
is
e
ignored files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzsimons
gi
t
w
e
b: Use rev-list --skip
o
ption
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Rober
t
Fitzsimons
gitw
e
b: Change history action t
o
use
pars
e
_c
o
mm
i
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Ro
b
ert Fitzsimon
s
gitweb: Change atom, rss actions to
u
se pa
r
se_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzs
i
mons
git
w
eb: Chan
g
e hea
d
er
search a
c
t
ion
t
o use parse_commit
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
o
bert Fitzsimons
gitweb:
C
hange log action to use parse_com
m
its
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsi
m
ons
gi
t
w
e
b
:
Ch
a
nge summary
,
shortlog
a
c
ti
o
ns
to use
p
arse_commit
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
obert Fitzsimon
s
gitweb: We do
l
onge
r
n
eed t
h
e --parents flag in
r
e
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
rt Fitzsim
o
ns
gitweb: Add pa
r
se_commits, used
to bulk
load com
m
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hama
n
o
git
-
ad
d
: wa
r
n
when addi
n
g a
n
ignored file
w
ith an explicit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C Hamano
g
i
t-add: add ignored fi
l
e
s
w
hen asked
explicitly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Ha
m
ano
read_direc
t
ory: show_both
optio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Jun
i
o
C Hamano
git-
r
m: D
o
cumentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
t3600: update the test fo
r
updated git rm
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Ju
n
io
C
Hamano
git-rm: update
t
o saner semantics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hama
n
o
m
a
tch_pathspec() -- ret
u
rn how well the
spec matche
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C H
a
m
ano
Merge branch 'jc/skip-count
'
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hamano
Merge branch '
j
c/git-add--interactive'
commit
|
commitdiff
|
tree
2006-12-25
J
unio C Haman
o
git-add
-
-
in
t
e
r
a
ctive: add docum
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
All
o
w branch
.
*
.
merge to
t
alk about remote tr
a
cki
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Hamano
Merge branch 'sb/merge-friendly'
commit
|
commitdiff
|
tree
2006-12-24
Jun
i
o
C
Ham
a
no
M
e
rge branch '
j
s/re
r
ere'
commit
|
commitdiff
|
tree
2006-12-24
J
o
hannes Schindelin
commi
t
-tr
e
e
: encourage UT
F
-8 commit m
e
ssage
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Sh
a
w
n O
.
Pearc
e
S
w
i
t
ch g
i
t
_m
m
ap
to use pre
a
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Shawn
O
.
Pearce
Rename gitf
a
ke
m
map
t
o git_mmap
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsi
m
ons
gitw
e
b: Pa
g
i
n
ate commit/au
t
hor/
c
ommitter search o
u
tput
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric
Wong
M
a
k
e
f
i
l
e
: add quick-
i
n
s
ta
l
l
-doc for installing pre
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
S
hawn O
.
Pe
a
rce
Display 'theirs' bran
c
h name wh
e
n p
o
ssible in merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
S
h
awn O
.
Pe
a
rce
Use exte
n
ded S
H
A1 syntax i
n
mer
g
e
-
r
ecurs
i
ve conflicts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Haman
o
reflog expire: do not punt on t
a
g
s
that point
a
t
non
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
b
e
rt Fitzsi
m
on
s
gi
t
web: Allow search to be di
s
able
d
f
r
om the config
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimo
n
s
gi
t
w
eb: Require a minimum
of two
c
h
a
r
a
cter
for the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt
F
itzs
i
mons
git
w
eb: U
s
e rev
-
list pattern search opti
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
N
i
c
ol
a
s Pitr
e
check
o
ut
:
m
a
ke
the message about the need f
o
r a new
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fit
z
simons
gitweb: optimize
git_summary
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gi
t
web: opt
i
mize git_shortlog_
b
ody
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt
F
i
tzsimons
gitweb
:
opt
i
miz
e
gi
t
_get_last_activit
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rob
e
rt Fit
z
simons
gitweb: Add missing show '
.
.
.
' li
n
ks c
h
ange
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhardt
Make git-sho
w
-
b
ranc
h
options
similar to git-branch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
B
r
ian Gernhardt
Kee
p
"git --git-dir" from causing a
b
us
e
rror
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wo
n
g
gi
t
-svn
:
enab
l
e common fetc
h
/commit options
f
or
d
commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Alex
a
ndre Julliard
vc
-
git
:
I
g
no
r
e errors
c
a
used by
a non-existent dir
e
ctory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
E
r
ic Wong
Remove NO_ACCURAT
E
_DIFF
options from build s
y
stems
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
J
u
nio C Ham
a
no
git-tag: lose ex
i
t
a
fter die
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
Really fix headers for __FreeBSD__
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Jun
i
o C H
a
ma
n
o
Do
n
ot support "partial
U
RL
shor
t
hand" anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
default pull: f
o
rg
e
t
about "new
b
ie prote
c
tion" for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C H
a
man
o
merge and
res
e
t:
a
djus
t
for "reset --hard" m
e
s
sages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C Haman
o
reflog expire: prune co
m
mits that a
r
e
not incomplete
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
u
n
i
o C Hama
n
o
comm
i
t-
t
ree: do n
o
t
overflow
MAXPARENT
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
n
n
es
S
c
hinde
l
in
Make git-
r
erere
a builtin
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes S
c
h
i
n
delin
A
d
d a test for gi
t
-rerere
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es Schindelin
move read_mmfil
e
()
in
t
o xdiff-inter
f
a
c
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
S
hawn O
.
Pea
r
ce
D
on't
cras
h
duri
n
g re
p
ack of a
r
eflog wi
t
h pr
u
ned commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
Mer
g
e
b
ranch 'm
a
ster' int
o
jc/f
s
ck-reflog
commit
|
commitdiff
|
tree
2006-12-22
S
h
awn
O
.
Pea
r
ce
Introduce a global lev
e
l
warn() fun
c
tio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
S
h
awn
O
.
Pe
a
rce
Rename
imap-se
n
d
'
s intern
a
l i
n
fo
/
wa
r
n functions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Jun
i
o C Ha
m
a
no
_
XOPEN_SOURCE problem
also
exis
t
s on
F
reeBSD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C H
a
mano
parse
-
re
m
o
te:
m
ark all refs
not for merge o
n
ly when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Haman
o
M
e
r
ge
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2006-12-22
Joha
n
nes Sch
i
ndelin
g
i
t
-reset --h
a
r
d
: tell
t
he user what the H
E
AD was reset to
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Jo
h
annes
S
chindeli
n
git-
t
ag: sup
p
ort -F <file> option
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio
C
H
amano
Revert "git-pull: refuse
default
merg
e
w
ithout branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Sug
g
est 'ad
d
' in am/revert/
c
herry-pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
nne
s
Sch
i
ndelin
Use git-merge-file in git-
m
erge-one-fil
e
, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Joh
a
nne
s
S
c
hindelin
diff --check: fix
o
ff by on
e
error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Quy
Tonthat
D
o
cumentation/git-branch: ne
w
-r to
delete remo
t
e-t
r
acking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Terje Sten Bjerkseth
Fi
x
system he
a
der problems
o
n Mac OS X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Ju
n
io C
Hama
n
o
g
i
t reflog expire
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next