repo.or.cz
/
git
/
mjg.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
reb
a
se -i: a
l
i
g
n
var
i
able n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase:
show consistent conflict resolution hint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
r
ebas
e
: extra
c
t
am code to new source file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
r
e
base: extract merge code to new s
o
urce file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
e
i
gber
g
k
r
e
base:
remo
v
e $branch as synonym for
$
orig_
h
ead
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: support --sta
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
r
e
ba
s
e: factor out call to pre-reb
a
se ho
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Zwe
i
gbergk
rebase: facto
r
ou
t
clean work tree c
h
eck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
r
e
b
a
s
e: factor out reference pars
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zweigbergk
reba
s
e
:
reorde
r
validation steps
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase -i
:
remove n
o
w unnec
e
ssary di
r
e
ctory checks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: fac
t
o
r
o
u
t command line option
pro
c
essing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: alig
n
v
a
r
i
able con
t
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigbergk
reba
s
e: align
varia
b
le names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: stricter
chec
k
of standalo
n
e
sub command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
rebase: act on
c
o
mmand l
i
ne
o
utside parsing loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase:
i
mprove detection of rebase in pro
g
re
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweig
b
ergk
rebase: remove un
u
sed rebas
e
state '
p
r
ev_head
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
b
erg
k
rebase: read
stat
e
outside
l
oop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: re
f
actor reading of sta
t
e
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigberg
k
rebase: cle
a
rer
names for directory variab
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Juni
o
C Hamano
Merge branch 'tr/merge
-
u
nbo
r
n-cl
o
b
ber'
commit
|
commitdiff
|
tree
2011-02-10
Ju
n
io C
H
a
mano
Merge branch '
j
c/unpac
k
-trees'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
Hama
n
o
M
erge branch '
j
c/fsck-fixes'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C Hamano
M
e
rge branch '
t
r/diff-words-test'
commit
|
commitdiff
|
tree
2011-02-10
Jun
i
o C Hamano
Merge branch 'rr/fi-import-ma
r
ks-
i
f
-
e
xi
s
t
s
'
commit
|
commitdiff
|
tree
2011-02-10
J
u
n
i
o
C Hama
n
o
Merge branch 'j
n
/
u
npack-l
s
tat-failu
r
e-re
p
o
r
t'
commit
|
commitdiff
|
tree
2011-02-10
Junio
C
Ha
m
ano
M
e
rge b
r
anch
'ef/alias-
v
ia-run-command'
commit
|
commitdiff
|
tree
2011-02-10
Junio C
Haman
o
M
erge branch 'cb/setup
'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
erge branch 'ae/bet
t
er-template
-
failure-report'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
Merge branch 'jn
/
cherry-pi
c
k-strategy-option'
commit
|
commitdiff
|
tree
2011-02-10
Junio C Hamano
M
erge branch 'maint-1
.
7
.
0' into maint
commit
|
commitdiff
|
tree
2011-02-10
Jona
t
han Nieder
f
ast-import:
i
n
troduc
e
"featu
r
e notes" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-10
Jonathan Nied
e
r
fast
-
import
:
clarify documentati
o
n of
"
fe
a
ture"
c
o
m
m
a
nd
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önig
Documentation/me
r
ge su
b
tree How-To:
fix t
y
po
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
J
en
s
L
ehmann
pull: Docume
n
t
the "--[no-]
r
ecu
r
s
e-sub
m
od
u
l
e
s" opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Jo
n
athan
Nieder
quote
.
h: simpl
i
fy the
i
nclusion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Th
á
i Ngọc Duy
sha
1
_object_
i
n
fo: examine cached_object store 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: m
o
ve find_cached_ob
j
ect up so sha1_o
b
ject_info
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Nguyễn Thái Ngọc
D
uy
Add const to parse_{commi
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 Du
y
diff
:
suppo
r
t --cached on unbor
n
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
Jakub Nar
e
bsk
i
gitweb:
M
ention optio
n
al P
e
rl modules in INSTALL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sitaram
Chamarty
post-receive
-
email: supp
r
ess error i
f
d
e
scription file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Thoyts
t
7
4
0
7
:
fix line endings for ming
w
build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes Sixt
t4120-apply-popt:
help systems with co
r
e
.
filemode=false
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Pat Tho
y
ts
t3509:
u
se unc
o
n
s
tr
a
ined
initial
t
est to
setup
r
eposi
t
ory
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Johannes
S
ixt
start_command: f
l
ush
b
uf
f
ers in
the WIN32 code p
a
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-02-07
Sh
a
wn O
.
Pearce
bun
d
le: Use OF
S
_DELTA
i
n
bundl
e
files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Junio C Haman
o
Merge branch 'jl/fetch
-
su
b
mo
d
ule-recurs
i
ve' i
n
to maint
commit
|
commitdiff
|
tree
2011-01-31
J
e
ns L
e
hma
n
n
t5526: Fix
wrong argument order in
"git
config"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-31
Jun
i
o
C
Hamano
Git 1
.
7
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Ha
m
ano
fsck:
d
o
not
g
ive up too early in fsck_dir(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Hamano
fsck: drop un
u
sed
pa
r
ameter from trave
r
se_o
n
e
_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Adam Tkac
D
o
n't pass "--
x
htm
l
" to hightlight
in gitweb
.
perl script
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio
C Hamano
M
e
r
ge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2011-01-27
J
onath
a
n Nieder
reb
a
se -i:
c
larif
y
in-edit
o
r do
c
u
mentation
o
f "exec"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Je
f
f
King
test
s
: sanitize more git envir
o
nment va
r
i
a
ble
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Junio C Haman
o
Merge branch 'jn/fast-impor
t
-empty
-
tree-
r
e
moval' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-27
Jo
n
ath
a
n
Nieder
fast-i
m
port:
treat filemodify with
e
mpty tree as delete
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jef
f
Ki
n
g
r
ebase: give
a bette
r
error message fo
r
bogus branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebas
e
: use explic
i
t "--" with checkou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Hamano
Git 1
.
7
.
4-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C H
a
mano
M
e
rge b
r
a
n
ch 'as/userdiff-pascal'
commit
|
commitdiff
|
tree
2011-01-24
J
u
n
io
C Haman
o
M
e
rge
b
ranch 'jn/setup-fixes'
commit
|
commitdiff
|
tree
2011-01-24
Jo
n
athan Niede
r
t
1510: fix typo in the c
o
mment of
a
tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-24
Junio C Haman
o
Documentation updates for 'GIT_WORK_T
R
E
E
without GIT_D
I
R
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
J
o
nathan Nieder
Sub
j
ect: s
e
tup: offic
i
all
y
support --work-tree
without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-21
Jona
t
ha
n
Nieder
Documentation:
d
o n
o
t tre
a
t rese
t
--keep a
s
a s
p
e
cial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-20
Björn Steinbrink
Correctl
y
repo
r
t
c
orrup
t
ed objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jonat
h
an Nieder
tests:
co
m
press th
e
s
e
tup t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Jona
t
han Nieder
tests: cosmetic
i
mp
r
ovem
e
nts to the repo-
s
etup te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
J
u
ni
o
C Hamano
Merge bra
n
c
h
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2011-01-19
Erik
F
aye-L
u
nd
ex
e
c_
c
md: remove
u
nused extern
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
erge
br
a
nc
h
'jn/git
w
eb
-
no-logo' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
M
e
rge branch 'jk/di
f
f-driver-bina
r
y-doc' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio C H
a
mano
Merge bra
n
ch 'tr/submodule
-
rel
a
tive-scp-url'
into
m
aint
commit
|
commitdiff
|
tree
2011-01-19
Juni
o
C H
a
mano
Merg
e
b
ranch '
r
j/maint-difftool-cygwin-workaround'
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
Junio C Hamano
Merge br
a
n
c
h 'rj/maint-test
-
f
ixes' into maint
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Haman
o
Me
r
ge branch
'jn/maint-
g
itweb-pathinfo-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Ha
m
a
n
o
Me
r
ge b
r
anch 'ak/describe-exact' into maint
commit
|
commitdiff
|
tree
2011-01-19
Junio
C
Hama
n
o
Merge
b
ranch 'jn/maint-fast-import-object
-
reuse' into
.
.
.
commit
|
commitdiff
|
tree
2011-01-19
J
unio C
Hamano
Mer
g
e branch
'jn
/
su
b
m
o
dule
-
b
-
c
u
rrent' into m
a
int
commit
|
commitdiff
|
tree
2011-01-19
J
u
nio C Hamano
Merge br
a
nch 'jc/maint
-
s
vn-info-te
s
t-fix' into maint
commit
|
commitdiff
|
tree
2011-01-19
Jun
i
o C Haman
o
Merge branc
h
'
nd/
m
aint-rel
a
tive' into maint
commit
|
commitdiff
|
tree
2011-01-19
Jonat
h
an Nieder
Document
a
tion/fast
-
import:
p
u
t explanation of M 040000
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-19
Ramsay Jones
s
vndump
.
c: Fix a printf format
c
o
m
piler warnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jona
t
han
N
ieder
remote-ext: do not
segfault for blank
l
i
nes
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jonathan Nieder
D
ocu
m
entati
o
n/
f
a
st-import: cap
i
talize beginnin
g
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
J
unio C Hamano
t40
3
4 (diff --word-diff): add a minimum
P
e
rl
dr
i
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jon
a
than Nie
d
er
t4034 (diff --w
o
rd-diff): style suggesti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Jon
a
t
h
an Nieder
userdiff: si
m
plify word-d
i
ff safeguard
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Thomas Rast
t4034: bulk verify bu
i
ltin word reg
e
x sani
t
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-18
Ramkumar Ramacha
n
dra
fast-import: In
t
r
o
duce --impo
r
t
-
marks-if
-
exists
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-16
Jonathan Nieder
ll-m
e
rg
e
:
simp
l
i
fy opts == NULL case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
J
u
nio
C Hamano
Git
1
.
7
.
4-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-01-13
Junio C Hamano
Merge branch '
j
n/gitwe
b
-n
o
-
logo'
commit
|
commitdiff
|
tree
2011-01-13
J
u
nio C Hamano
Merge branch '
j
n/perl-fu
n
cname'
commit
|
commitdiff
|
tree
2011-01-13
J
unio C Hamano
Mer
g
e
branch '
s
r/gitweb-hil
i
te-more'
commit
|
commitdiff
|
tree
2011-01-13
J
unio C Hamano
Merge branch
'
rj
/
svn-t
e
st'
commit
|
commitdiff
|
tree
2011-01-13
Junio
C
Hamano
Me
r
ge bra
n
ch 'rj/test-fixes'
commit
|
commitdiff
|
tree
next