repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Use branch names in 'git-rebase -m' conflict hunks.
2006-12-28
S
h
awn
O
.
Pearce
Use bra
n
ch name
s
i
n
'git-
r
ebase -m' co
n
f
l
ict hun
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Shawn
O
.
P
e
arce
Honor
GI
T
_REFLOG_ACTION
in git
-
rebase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
S
h
awn O
.
Pearce
Use GIT_REFLOG
_
AC
T
I
O
N environme
n
t vari
a
b
le instead
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jakub Na
r
ebski
g
i
tw
e
b: P
r
ecompile
CGI
r
o
utines
f
or
m
od_p
e
rl
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Jaku
b
Narebski
gitweb: Add mod_perl version stri
n
g
t
o "genera
t
or"
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-28
Junio C Ha
m
ano
M
erge
bran
c
h 'sp/gc'
commit
|
commitdiff
|
tree
2006-12-27
Junio C
H
a
mano
Set
N
O_
M
MA
P
f
or Cygwin by d
e
f
ault
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio
C
Hamano
Use
'
repac
k
-a -d -l' in
s
t
e
a
d
o
f
'
re
p
ack
-
a
-d' in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Robert Fitzsimons
gitweb: Re-enable
rev-list -
-
par
e
nts fo
r
parse_com
m
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Quy To
n
that
git
-
sen
d
-
e
mail: defa
u
lt value for "From
:
" f
i
eld
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
everyda
y
: replac
e
a few 'prune' and 'repack
'
wit
h
'gc'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
S
haw
n
O
.
Pea
r
ce
Creat
e
'git gc
'
to perfo
r
m com
m
on maintenance o
p
erations
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
git-reflog: gc
.
* configur
a
tion and documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hamano
rerer
e
gc:
honor co
n
figuration an
d
document it
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Juni
o
C Ha
m
a
no
coun
t
-obje
c
ts -
v
: s
h
ow n
u
mb
e
r of packs as well
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Jun
i
o C
H
amano
Merge
b
r
a
nch
'jc/fsck-reflog'
commit
|
commitdiff
|
tree
2006-12-27
Junio C Hama
n
o
e
v
e
ryday: updat
e
for v1
.
5
.
0
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric W
o
ng
git-svn
:
d
commi
t
should
diff a
g
ainst
t
he current HEAD
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-27
Eric Wong
git-svn:
quiet d
o
wn
t
ests and fix some unportable shell
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Andy Parkins
h
oo
k
s/c
o
mmit-
m
s
g: add example to add Signe
d
-
o
ff
-
b
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nic
o
las
Pitre
move gi
t
-blame to
i
t
s place in
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicolas Pitre
Add g
i
t
-
re
f
log to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Junio C Ham
a
no
Document
git-reset <com
m
i
t> -- <paths>
.
.
.
commit
|
commitdiff
|
tree
2006-12-26
J
unio
C Hamano
Document
--numstat in g
i
t-a
p
pl
y
and git-d
i
ff
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Jun
i
o C Hamano
s
h
o
w
-bra
n
ch --
r
eflo
g
: add
d
o
cumentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Nicol
a
s Pit
r
e
add
.
mailmap for git-shortlog output wi
t
h the g
i
t repo
s
itor
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
J
unio C Ham
a
n
o
GIT v1
.
5
.
0 previe
w
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-26
Juni
o
C Hamano
Merge branch 'jc
/
b
m'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Haman
o
Merge branch 'rf/web'
commit
|
commitdiff
|
tree
2006-12-26
Junio C Hama
n
o
git-add -f: allow addi
n
g
o
t
h
erwise ignor
e
d files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
gitweb
:
U
s
e
rev-list --skip option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Ro
b
ert
F
itzsimons
gitw
e
b: Change history action to
u
se par
s
e_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert
F
itz
s
imons
g
i
t
w
eb:
Change atom, r
s
s
a
ctions t
o
use pars
e
_com
m
its
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Rob
e
rt Fitzsim
o
n
s
gi
t
we
b
: Ch
a
nge he
a
der search
a
ction to use parse_commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
o
b
ert Fitzsimons
g
i
t
w
e
b
: Cha
n
g
e
log
action to use parse_commit
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
R
ob
e
rt Fitzs
i
mons
gitw
e
b: Change s
u
mma
r
y, shortlog actions to use pa
r
se_co
m
mits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert F
i
tzsimons
gi
t
web: We do lon
g
er need
t
he --parents flag in rev
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Robert Fitzsimons
g
i
t
w
e
b: A
d
d
p
a
r
se_commits,
used to bulk
l
oad
c
om
m
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Juni
o
C Hamano
g
it-add: warn w
h
en adding an i
g
nored file with an exp
l
i
c
it
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Haman
o
git-add: add ig
n
ore
d
files when asked explicitly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Ham
a
n
o
r
e
ad_directory: show_both option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio C Hama
n
o
git-rm: Documentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C Hamano
t3600: updat
e
th
e
test f
o
r
u
p
d
ated git rm
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Junio
C
Hamano
git-rm: u
p
date to saner
semantics
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
Juni
o
C Hamano
matc
h
_pathspec()
-- return
how
well the spec
m
atched
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-25
J
u
nio C Hamano
Merge branch 'jc/skip-c
o
unt'
commit
|
commitdiff
|
tree
2006-12-25
Junio C H
a
ma
n
o
Mer
g
e b
r
anch
'
jc/git-add--interactive
'
commit
|
commitdiff
|
tree
2006-12-25
Ju
n
io C Ha
m
ano
git-add -
-
interactive: add
d
ocumentatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C
H
a
m
ano
Allow
branch
.
*
.
merge to talk about rem
o
te tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Junio C Ham
a
no
Merge branch
'sb/merge-friendly'
commit
|
commitdiff
|
tree
2006-12-24
Juni
o
C Ha
m
ano
Merge branc
h
'js/rerere
'
commit
|
commitdiff
|
tree
2006-12-24
Johannes Schindelin
commit
-
tree: enco
u
r
a
ge
UTF-8 commit messages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pearce
Switc
h
git_mmap
t
o use pread
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-24
Shawn O
.
Pea
r
ce
Rename gitfa
k
e
mmap
t
o
git_mmap
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
obert
Fitz
s
imons
g
itweb: Paginate c
o
mmit/author/c
o
mmitte
r
search
ou
t
put
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Er
i
c
W
o
ng
Makefile:
add q
u
i
c
k-install-doc f
o
r i
n
stalling
p
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
Pearce
Display '
t
heir
s
' branc
h
name when possib
l
e in merg
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Shawn O
.
P
e
arce
U
s
e extended SH
A
1 syntax in
m
erge-recursi
v
e
conflicts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
r
ef
l
og
expire: do no
t
p
unt on tags that poin
t
at non
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
ber
t
F
i
tzsimons
gitweb: Allo
w
s
e
arch to be
d
isa
b
led f
r
om the config
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robe
r
t Fitzsimons
gitweb: Require a
min
i
mum o
f
two character for the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: Use rev-list pattern search opt
i
ons
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Nicolas P
i
tre
ch
e
ckout:
m
ake the message about the need for a
new
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert F
i
t
zsimons
gi
t
web: optimize g
i
t_summary
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
R
o
be
r
t Fitzsimons
gi
t
web: optimize git_shortlog_body
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Rober
t
Fitzsimons
gitweb:
o
p
t
i
mize git_
g
et_last_activity
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Robert Fitzsimons
gitweb: Add m
i
s
sing
show
'
.
.
.
'
l
inks ch
a
n
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhar
d
t
M
a
ke git-
s
how-br
a
nch options s
i
milar to
g
it-bra
n
ch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Brian Gernhardt
Ke
e
p "g
i
t --gi
t
-dir" from
c
ausing a bus error
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
git-svn
:
en
a
b
l
e common fe
t
ch/com
m
i
t op
t
i
o
ns fo
r
dc
o
mmit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
A
l
e
xandre Jul
l
iard
vc-git: Ignore errors c
a
used by
a non-existent directo
r
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Eric Wong
Remove
N
O
_
ACCURA
T
E_DIFF options fro
m
bui
l
d systems
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Junio C Hamano
git-ta
g
: lo
s
e exit after die
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-23
Juni
o
C Hamano
Really fix headers for
_
_FreeB
S
D__
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
Hamano
Do
not
support "partial
URL shorth
a
n
d" anym
o
re
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
H
am
a
no
de
f
au
l
t p
u
ll: forg
e
t abou
t
"newbie protecti
o
n"
f
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
merge and res
e
t: adjust f
o
r "r
e
se
t
--hard" messages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Jun
i
o
C
Haman
o
reflog expire: prune commits that are not
inco
m
pl
e
te
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C H
a
mano
commit-tree: d
o
not overflo
w
MAXPAREN
T
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johan
n
es S
c
hindelin
M
a
k
e
git-
r
erere
a builtin
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johanne
s
Schindelin
Add a
t
est for git
-
re
r
e
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schin
d
e
lin
move read_m
m
file() in
t
o xdiff-int
e
rface
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn
O
.
Pearce
Don't crash during repack of a reflog with pruned
co
m
mit
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Ju
n
io C Ha
m
ano
Merge branch 'm
a
st
e
r' i
n
to j
c
/fsck
-
re
f
log
commit
|
commitdiff
|
tree
2006-12-22
Sh
a
wn O
.
Pearc
e
I
nt
r
oduce a global le
v
e
l
warn
(
) function
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Rename imap-se
n
d
'
s internal info/warn func
t
ions
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C
H
am
a
n
o
_XOPE
N
_SOUR
C
E problem also exis
t
s
on F
r
e
e
BSD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Junio C Hamano
parse-remote: mark all refs not for
m
erge only when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Jun
i
o
C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-22
Johann
e
s
S
chindelin
git-reset --hard: tell the user what the
H
EA
D
was
r
eset to
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schindelin
git-tag
:
support -F <fil
e
>
o
pti
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
J
unio C Hamano
Revert "git-pul
l
:
refuse default mer
g
e wit
h
o
ut br
a
nc
h
.
.
.
commit
|
commitdiff
|
tree
2006-12-22
Shawn O
.
Pearce
Su
g
g
e
st 'add' i
n
am
/
r
e
vert/cherry-pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Schind
e
l
i
n
U
s
e
g
it-m
e
rge-fi
l
e in git-merge-o
n
e-file, too
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-22
Johannes Sch
i
ndelin
diff --check: fix off by
o
ne error
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Quy Tonthat
D
o
c
u
m
entation/git-br
a
nch: ne
w
-r to dele
t
e r
e
m
o
te-tracking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
T
e
rje
S
ten Bje
r
k
seth
F
i
x system hea
d
e
r
problems on Mac
OS X
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
Juni
o
C Hamano
git re
f
log
e
xpi
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-21
J
u
n
io C
Hamano
Move in_merge_base
s
(
)
to com
m
it
.
c
commit
|
commitdiff
|
tree
2006-12-21
J
u
n
io C Hamano
reflog: fix w
a
rning
m
essage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next
