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
rebase -i: align variable names
2011-02-10
Martin von Zw
e
igbergk
rebase -i: al
i
gn va
r
iable
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: show
c
onsistent conflict re
s
olut
i
on hint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: extr
a
ct am c
o
de to new so
u
r
c
e
f
ile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: extract
m
erge code to
new source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: remove $branch as synonym for
$ori
g
_head
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigb
e
r
g
k
r
ebase -
i
: supp
o
rt --st
a
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
be
r
gk
rebase: fact
o
r out call to p
r
e-reba
s
e hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zweigbergk
rebase: factor ou
t
clean work tree check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: factor out
reference pars
i
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: reorder valid
a
tion
steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Zwei
g
bergk
rebase -i: remove
n
o
w unneces
s
a
ry dir
e
ct
o
r
y checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: facto
r
out comman
d
li
n
e option p
r
ocess
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zweigber
g
k
rebase: align variable content
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase:
a
li
g
n variabl
e
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in von Zweigberg
k
r
ebas
e
: stricter che
c
k
o
f standalone sub comman
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: act on command l
i
n
e
o
u
t
side pa
r
sin
g
loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zweigbergk
re
b
as
e
: impro
v
e
detection
of rebase in p
r
ogress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbergk
r
e
base: r
e
move unused rebase state 'prev_head'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
o
n Zweigb
e
rgk
re
b
ase: read
s
tate outside loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zwe
i
g
b
e
rgk
rebase: refac
t
or re
a
ding of
s
tate
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbe
r
gk
rebase: clearer names for d
i
recto
r
y varia
b
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
e
r
g
e branch
'
tr/
m
erge-unborn-c
l
o
b
ber'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C
Haman
o
Merge bran
c
h 'jc/unpa
c
k-trees'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch
'jc/fsc
k
-fixes
'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Ham
a
no
Merge
b
ranch 'tr/
d
i
f
f-words-
t
e
s
t'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Haman
o
Merge
b
ranch 'rr/fi-impo
r
t
-
marks-if
-
exists'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o
C
Hamano
Me
r
ge br
a
nch
'jn
/
unpac
k
-lst
a
t
-
failure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
e
rge bra
n
ch 'ef/alia
s
-via-run-comm
a
nd'
commit
|
commitdiff
|
tree
2011-02-10
J
u
nio C Haman
o
Merg
e
branch 'cb/setup'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge b
r
anch 'ae/better-template-f
a
ilure-report'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch 'jn/cherr
y
-p
i
c
k
-
strategy-o
p
tion'
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
M
e
r
g
e branch
'main
t
-
1
.
7
.
0'
i
nto
maint
commit
|
commitdiff
|
tree
2011-02-10
Jo
n
ath
a
n Nieder
fast-import: introduc
e
"
feature notes" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jona
t
h
a
n Nied
e
r
fast-im
p
o
r
t: clarify d
o
cumentati
o
n of "f
e
at
u
re" com
m
an
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-09
Uwe Kleine-Köni
g
Documenta
t
ion/merge
subtree How
-
To: fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jens
L
e
hm
a
n
n
p
ull: Document
the "--
[
n
o-]
r
ecurse-
s
ubmo
d
ules" opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jonathan Ni
e
der
qu
o
te
.
h: simplify the inclusion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguy
ễ
n Thái
N
gọc Duy
s
h
a1_objec
t
_
i
n
fo: examin
e
cached_object stor
e
too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn
Thái Ngọc
Duy
sha1_file
.
c: move find
_
cached_object
up so
sha1_object_info
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Ng
u
yễn Thái Ngọc
Duy
Add
c
on
s
t to p
a
rse_{c
o
mmi
t
,tag
}
_bu
f
fer()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc Duy
diff:
supp
o
r
t --cache
d
on unb
o
rn branches
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Ja
k
ub N
a
reb
s
ki
gitweb: M
e
nt
i
on
optional P
e
rl modules
in
INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sitaram Chama
r
ty
post-receive-emai
l
: su
p
press error if d
e
sc
r
ip
t
ion file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t7407: fix line endi
n
gs for
m
ingw
b
u
ild
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johanne
s
Six
t
t4
1
20-apply-popt: help systems with core
.
fil
e
mode=false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t350
9
: u
s
e unconst
r
a
ined initial test to setup reposito
r
y
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jo
h
annes Si
x
t
s
t
a
r
t_c
o
m
m
and: flush buff
e
rs
in the
W
IN32 code path
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Shawn
O
.
Pearce
bundle: Use OFS_DELT
A
i
n
bundle
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Ham
a
no
Merge branch 'jl/fetch-submodule-recursive' into maint
commit
|
commitdiff
|
tree
2011-01-31
Jens Leh
m
a
n
n
t5526: Fix wrong
a
r
gu
m
en
t
o
rder in "git c
o
nfig
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Hamano
Git 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C H
a
mano
fs
c
k: do not give up too early in fsck_dir(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
J
unio C Hamano
fsck:
drop
u
nuse
d
paramete
r
from traverse
_
on
e
_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
Don't pass
"
--xhtml" to
h
ightlight i
n
g
i
tweb
.
p
e
rl
sc
r
ipt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jun
i
o C Hamano
Me
r
ge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2011-01-27
Jon
a
than Nieder
reb
a
se -
i
: clarify i
n
-editor doc
u
me
n
tation of "exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests: san
i
tize more git environment variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C
Hamano
Merge branc
h
'
j
n/fast-impo
r
t
-
empty-tree-
r
emoval' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jona
t
ha
n
Ni
e
der
fast-import: t
r
eat fil
e
m
odify with empt
y
tree as delete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff Kin
g
r
e
ba
s
e
:
give a better erro
r
m
e
s
sage
for bogus branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff K
i
ng
rebas
e
:
u
se expli
c
it "--"
w
ith ch
e
ckout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
G
i
t 1
.
7
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Juni
o
C Hamano
M
erge branch 'as/userdiff-pascal'
commit
|
commitdiff
|
tree
2011-01-24
Junio C
H
amano
Merge branch 'j
n
/se
t
up-fixes'
commit
|
commitdiff
|
tree
2011-01-24
Jona
t
h
an Nieder
t1510: fix ty
p
o in th
e
comment of
a
tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Do
c
u
m
entation updates f
o
r
'
GIT_WORK_
T
REE without GIT_DIR
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jonathan Nied
e
r
Subject: se
t
up: officia
l
l
y
support --work-tree withou
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
J
ona
t
han N
i
eder
Documentation: do no
t
t
r
eat re
s
e
t
--k
e
ep
as a special
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
B
j
ö
rn
Steinbr
i
nk
Cor
r
ectly report
corrupted
o
bjects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jon
a
than Nieder
t
e
s
ts: compress
the setup
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonathan Nieder
tests
:
cosmetic impr
o
v
ements to the repo-setup test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ham
a
no
Mer
g
e
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-01-19
Erik Fay
e
-L
u
nd
exec_cmd: remove unuse
d
ext
e
rn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
Merge branch '
j
n/g
i
tweb-
n
o-logo'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Ham
a
no
M
erge
b
r
a
nch
'jk/dif
f
-dri
v
er-bin
a
ry-do
c
' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
Merge branch 'tr/submodule-rela
t
ive-scp-url' into
maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ham
a
no
M
erge b
r
anch 'rj/ma
i
nt-difftool-cygwin-workaround'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C
H
amano
Merge branch
'
rj/mai
n
t-test-fixe
s
' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
unio C Ham
a
no
Me
r
g
e br
a
n
ch
'
j
n
/main
t
-g
i
tweb-pathinfo-fix'
into
m
aint
commit
|
commitdiff
|
tree
2011-01-19
J
u
n
io C Ham
a
no
Merge branc
h
'ak/d
e
scrib
e
-exac
t
' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio
C Ha
m
ano
Mer
g
e branch 'jn/
m
aint-fas
t
-im
p
ort-object-reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Ham
a
no
Mer
g
e b
r
anch 'jn
/
submodule-b-current
'
int
o
m
aint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C Ha
m
an
o
Merge branch 'jc/maint-svn-info-test-f
i
x'
i
nto
maint
commit
|
commitdiff
|
tree
2011-01-19
Ju
n
io C Ha
m
ano
Merge branch 'nd/
m
aint-
r
elati
v
e' into maint
commit
|
commitdiff
|
tree
2011-01-19
Jo
n
athan Nieder
Documentation
/
f
a
s
t-imp
o
rt
:
put ex
p
la
n
a
tio
n
of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
R
amsay Jones
svndump
.
c
: Fix a printf format compil
e
r warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
remot
e
-ex
t
: do not segfault for bla
n
k lines
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonatha
n
Nieder
Documen
t
a
t
ion/fast-impo
r
t: c
a
pitalize
b
egin
n
ing o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Junio C H
a
mano
t4034 (
d
i
f
f --word-diff): add a min
i
mum P
e
rl drier
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jon
a
than Nieder
t
4
034 (diff --word-diff)
:
st
y
l
e
suggest
i
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan
N
ie
d
er
userd
i
ff: simplify
w
or
d
-d
i
ff
s
af
e
guard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Thom
a
s R
a
s
t
t4
0
3
4: bulk ve
r
ify b
u
i
ltin
w
ord regex
s
a
ni
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Ramkumar Ramachandr
a
fast-impo
r
t: I
n
troduce
--import-
m
arks-if-
e
xist
s
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-16
Jon
a
than Nieder
ll-merge:
s
implify
opt
s
== N
U
LL
case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Junio C H
a
mano
Git 1
.
7
.
4-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
J
u
nio
C
Hamano
Merg
e
b
ranch 'jn/gitweb
-
no-logo'
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hamano
Merge
br
a
n
ch 'jn
/
perl-funcname'
commit
|
commitdiff
|
tree
2011-01-13
Junio C H
a
ma
n
o
Merge bra
n
ch 'sr/gi
t
web-hilite-more'
commit
|
commitdiff
|
tree
2011-01-13
Juni
o
C
Hama
n
o
Merge branc
h
'rj/svn-test'
commit
|
commitdiff
|
tree
2011-01-13
Ju
n
i
o C H
a
mano
M
e
rge
b
ranch '
r
j/tes
t
-fixes'
commit
|
commitdiff
|
tree
next