summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'cb/mergetool'Junio C Hamano2009-01-013-31/+100
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mergetool: Don't keep temporary merge files unless told toCharles Bailey2008-12-122-0/+13
| * | | | | | | | | | | mergetool: Add prompt to continue after failing to merge a fileCharles Bailey2008-12-121-9/+43
| * | | | | | | | | | | Add -y/--no-prompt option to mergetoolCharles Bailey2008-11-143-4/+26
| * | | | | | | | | | | Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey2008-11-141-19/+19
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-01-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Documentation/git-tag.txt: minor typo and grammar fixjidanni@jidanni.org2009-01-011-2/+2
* | | | | | | | | | | | Merge branch 'lt/reset-merge'Junio C Hamano2008-12-292-9/+46
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Document "git-reset --merge"Junio C Hamano2008-12-091-1/+28
| * | | | | | | | | | | | Add 'merge' mode to 'git reset'Linus Torvalds2008-12-021-8/+18
* | | | | | | | | | | | | Merge branch 'np/auto-thread'Junio C Hamano2008-12-292-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Force t5302 to use a single threadJohannes Schindelin2008-12-151-0/+1
| * | | | | | | | | | | | | pack-objects: don't use too many threads with few objectsNicolas Pitre2008-12-131-0/+4
| * | | | | | | | | | | | | autodetect number of CPUs by default when using threadsNicolas Pitre2008-12-121-1/+4
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-12-293-16/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Prepare for v1.6.1.1 maintenance releaseJunio C Hamano2008-12-292-1/+24
| * | | | | | | | | | | | | Documentation/diff-options.txt: unify optionsjidanni@jidanni.org2008-12-291-14/+4
| * | | | | | | | | | | | | gitweb: Fix export check in git_get_projects_listDevin Doucette2008-12-271-2/+3
* | | | | | | | | | | | | | Fix the building of gitman.info documentTeemu Likonen2008-12-292-3/+7
* | | | | | | | | | | | | | Fix the building of user-manual.texi and gitman.texi documentsTeemu Likonen2008-12-291-3/+4
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-12-277-97/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'rs/maint-tformat-foldline' into maintJunio C Hamano2008-12-271-46/+73
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | pretty: support multiline subjects with format:René Scharfe2008-12-271-19/+34
| | * | | | | | | | | | | | pretty: factor out format_subject()René Scharfe2008-12-271-18/+24
| | * | | | | | | | | | | | pretty: factor out skip_empty_lines()René Scharfe2008-12-271-9/+15
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'rs/maint-retval-fix' into maintJunio C Hamano2008-12-272-37/+26
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | merge-file: handle freopen() failureRené Scharfe2008-12-261-2/+5
| | * | | | | | | | | | | | daemon: cleanup: factor out xstrdup_tolower()René Scharfe2008-12-261-21/+13
| | * | | | | | | | | | | | daemon: cleanup: replace loop with ifRené Scharfe2008-12-261-13/+5
| | * | | | | | | | | | | | daemon: handle freopen() failureRené Scharfe2008-12-261-1/+3
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'sp/maint-describe-all-tag-warning' into maintJunio C Hamano2008-12-272-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | describe: Avoid unnecessary warning when using --allShawn O. Pearce2008-12-262-1/+7
| * | | | | | | | | | | | | git-send-email.txt: move --format-patch paragraph to a proper locationAdeodato Simó2008-12-271-6/+6
| * | | | | | | | | | | | | git-shortlog.txt: improve documentation about .mailmap filesAdeodato Simó2008-12-271-7/+33
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Start 1.6.2 cycleJunio C Hamano2008-12-272-1/+29
|/ / / / / / / / / / / /
* | | | | | | | | | | | GIT 1.6.1v1.6.1Junio C Hamano2008-12-242-0/+9
* | | | | | | | | | | | Merge branch 'js/rebase-i-p'Junio C Hamano2008-12-242-16/+58
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-242-3/+13
| * | | | | | | | | | | | rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-212-3/+2
| * | | | | | | | | | | | Show a failure of rebase -p if the merge had a conflictJohannes Sixt2008-12-211-11/+44
* | | | | | | | | | | | | t9129: skip the last three tests if UTF-8 locale is not availableMiklos Vajna2008-12-221-13/+17
* | | | | | | | | | | | | GIT 1.6.1-rc4v1.6.1-rc4Junio C Hamano2008-12-211-1/+18
* | | | | | | | | | | | | Always show which directory is not a git repositoryRichard Hartmann2008-12-213-4/+4
* | | | | | | | | | | | | Make help entries alphabeticalRichard Hartmann2008-12-211-4/+4
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-12-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | doc/git-fsck: change the way for getting heads' SHA1sMarkus Heidelberg2008-12-211-1/+2
* | | | | | | | | | | | | git-revert documentation: refer to new HOWTO on reverting faulty mergesBoyd Stephen Smith Jr2008-12-211-0/+8
* | | | | | | | | | | | | git-revert: record the parent against which a revert was madeRobin Rosenberg2008-12-211-0/+5
* | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2008-12-212-63/+213
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | gitk: Force the focus to the main window on WindowsJohannes Sixt2008-12-221-0/+5
View Lorry Controller Status