summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2010-11-17Merge branch 'ak/submodule-sync'Libravatar Junio C Hamano2-3/+14
2010-11-17Merge branch 'jk/maint-rev-list-nul'Libravatar Junio C Hamano4-6/+16
2010-11-17Merge branch 'ks/no-textconv-symlink'Libravatar Junio C Hamano6-25/+114
2010-11-17Merge branch 'jn/gitweb-test'Libravatar Junio C Hamano4-4/+35
2010-11-17Merge branch 'cb/diff-fname-optim'Libravatar Junio C Hamano3-25/+124
2010-11-17Merge branch 'jk/no-textconv-symlink'Libravatar Junio C Hamano2-3/+34
2010-11-17Merge branch 'dk/maint-blame-el'Libravatar Junio C Hamano1-0/+1
2010-11-17Merge branch 'maint'Libravatar Junio C Hamano6-24/+88
2010-11-17t6022: Use -eq not = to test output of wc -lLibravatar Brian Gernhardt1-32/+32
2010-11-17clean: remove redundant variable baselenLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Libravatar Johan Herland3-3/+351
2010-11-17cmd_merge(): Parse options before checking MERGE_HEADLibravatar Johan Herland1-16/+17
2010-11-17Provide 'git notes get-ref' to easily retrieve current notes refLibravatar Johan Herland3-0/+47
2010-11-17git notes merge: Add testcases for merging notes trees at different fanoutsLibravatar Johan Herland1-0/+436
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland7-4/+248
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland2-2/+85
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland4-3/+24
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland5-4/+394
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland5-13/+474
2010-11-17Documentation: Preliminary docs on 'git notes merge'Libravatar Johan Herland1-1/+43
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland4-2/+559
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland4-11/+532
2010-11-17builtin/notes.c: Refactor creation of notes commits.Libravatar Johan Herland4-24/+47
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland5-0/+392
2010-11-17builtin/notes.c: Split notes ref DWIMmery into a separate functionLibravatar Johan Herland1-6/+11
2010-11-17notes.c: Use two newlines (instead of one) when concatenating notesLibravatar Johan Herland5-3/+15
2010-11-17(trivial) t3303: Indent with tabs instead of spaces for consistencyLibravatar Johan Herland1-9/+9
2010-11-17notes.h/c: Propagate combine_notes_fn return value to add_note() and beyondLibravatar Johan Herland4-37/+43
2010-11-17Merge branch 'mz/maint-rebase-X-fix' into maintLibravatar Junio C Hamano1-0/+21
2010-11-17Documentation/git-pull: clarify configurationLibravatar Martin von Zweigbergk1-6/+8
2010-11-17Document that rev-list --graph triggers parent rewriting.Libravatar Yann Dirson1-0/+2
2010-11-17Fix username and password extraction from HTTP URLsLibravatar Gabriel Corona2-2/+12
2010-11-17t5550: test HTTP authentication and userinfo decodingLibravatar Gabriel Corona4-0/+40
2010-11-17git instaweb: enable remote_headsLibravatar Giuseppe Bilotta1-0/+2
2010-11-17gitweb: group remote heads by remoteLibravatar Giuseppe Bilotta2-20/+152
2010-11-17gitweb: provide a routine to display (sub)sectionsLibravatar Giuseppe Bilotta1-0/+38
2010-11-17gitweb: refactor repository URL printingLibravatar Giuseppe Bilotta1-1/+6
2010-11-17gitweb: remotes view for a single remoteLibravatar Giuseppe Bilotta1-4/+26
2010-11-17gitweb: allow action specialization in page headerLibravatar Giuseppe Bilotta1-1/+9
2010-11-17gitweb: nagivation menu for tags, heads and remotesLibravatar Giuseppe Bilotta1-3/+16
2010-11-17gitweb: separate heads and remotes listsLibravatar Giuseppe Bilotta1-4/+27
2010-11-17gitweb: git_get_heads_list accepts an optional list of refsLibravatar Giuseppe Bilotta1-4/+7
2010-11-17gitweb: introduce remote_heads featureLibravatar Giuseppe Bilotta1-2/+16
2010-11-17gitweb: use fullname as hash_base in heads linkLibravatar Giuseppe Bilotta1-1/+1
2010-11-17allow command-specific pagers in pager.<cmd>Libravatar Jeff King3-10/+52
2010-11-17log.decorate: accept 0/1 bool valuesLibravatar Jeff King2-2/+23
2010-11-16clean: avoid quoting twiceLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2010-11-16document sigchain apiLibravatar Jeff King1-0/+41
2010-11-16Keep together options controlling the behaviour of diffcore-rename.Libravatar Yann Dirson1-14/+12
2010-11-15use persistent memory for rejected pathsLibravatar Clemens Buchacher4-42/+38
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 21:58:17 +0000